|
 |
094ffec |
From e4a8812d72529fbaf168e50725b0ae6bf9951d23 Mon Sep 17 00:00:00 2001
|
|
|
094ffec |
From: Jacek Caban <jacek@codeweavers.com>
|
|
|
094ffec |
Date: Thu, 12 Feb 2015 17:27:47 +0100
|
|
|
094ffec |
Subject: d2d1_1helper.h: Added a few missing declarations.
|
|
|
094ffec |
|
|
|
094ffec |
|
|
|
094ffec |
diff --git a/mingw-w64-headers/include/d2d1_1helper.h b/mingw-w64-headers/include/d2d1_1helper.h
|
|
|
094ffec |
index 9523203..54c6539 100644
|
|
|
094ffec |
--- a/mingw-w64-headers/include/d2d1_1helper.h
|
|
|
094ffec |
+++ b/mingw-w64-headers/include/d2d1_1helper.h
|
|
|
094ffec |
@@ -10,11 +10,15 @@
|
|
|
094ffec |
#ifndef D2D_USE_C_DEFINITIONS
|
|
|
094ffec |
|
|
|
094ffec |
namespace D2D1 {
|
|
|
094ffec |
+ template<> struct TypeTraits<INT32> {
|
|
|
094ffec |
+ typedef D2D1_POINT_2L Point;
|
|
|
094ffec |
+ typedef D2D1_RECT_L Rect;
|
|
|
094ffec |
+ };
|
|
|
094ffec |
|
|
|
094ffec |
- D2D1FORCEINLINE D2D1_VECTOR_2F Vector2F(FLOAT x = 0.0f, FLOAT y = 0.0f) {
|
|
|
094ffec |
- D2D1_VECTOR_2F r = {x, y};
|
|
|
094ffec |
- return r;
|
|
|
094ffec |
- }
|
|
|
094ffec |
+ template<> struct TypeTraits<LONG> {
|
|
|
094ffec |
+ typedef D2D1_POINT_2L Point;
|
|
|
094ffec |
+ typedef D2D1_RECT_L Rect;
|
|
|
094ffec |
+ };
|
|
|
094ffec |
|
|
|
094ffec |
D2D1FORCEINLINE D2D1_LAYER_PARAMETERS1 LayerParameters1(CONST D2D1_RECT_F &contentBounds = D2D1::InfiniteRect(),
|
|
|
094ffec |
ID2D1Geometry *geometricMask = NULL, D2D1_ANTIALIAS_MODE maskAntialiasMode = D2D1_ANTIALIAS_MODE_PER_PRIMITIVE,
|
|
|
094ffec |
@@ -63,6 +67,11 @@ namespace D2D1 {
|
|
|
094ffec |
}
|
|
|
094ffec |
};
|
|
|
094ffec |
|
|
|
094ffec |
+ D2D1FORCEINLINE D2D1_VECTOR_2F Vector2F(FLOAT x = 0.0f, FLOAT y = 0.0f) {
|
|
|
094ffec |
+ D2D1_VECTOR_2F r = {x, y};
|
|
|
094ffec |
+ return r;
|
|
|
094ffec |
+ }
|
|
|
094ffec |
+
|
|
|
094ffec |
D2D1FORCEINLINE D2D1_VECTOR_3F Vector3F(FLOAT x = 0.0f, FLOAT y = 0.0f, FLOAT z = 0.0f) {
|
|
|
094ffec |
D2D1_VECTOR_3F r = {x, y, z};
|
|
|
094ffec |
return r;
|
|
|
094ffec |
@@ -72,6 +81,14 @@ namespace D2D1 {
|
|
|
094ffec |
D2D1_VECTOR_4F r = {x, y, z, w};
|
|
|
094ffec |
return r;
|
|
|
094ffec |
}
|
|
|
094ffec |
+
|
|
|
094ffec |
+ D2D1FORCEINLINE D2D1_POINT_2L Point2L(INT32 x = 0, INT32 y = 0) {
|
|
|
094ffec |
+ return Point2<INT32>(x, y);
|
|
|
094ffec |
+ }
|
|
|
094ffec |
+
|
|
|
094ffec |
+ D2D1FORCEINLINE D2D1_RECT_L RectL(INT32 left = 0.0f, INT32 top = 0.0f, INT32 right = 0.0f, INT32 bottom = 0.0f) {
|
|
|
094ffec |
+ return Rect<INT32>(left, top, right, bottom);
|
|
|
094ffec |
+ }
|
|
|
094ffec |
}
|
|
|
094ffec |
|
|
|
094ffec |
#endif /* D2D_USE_C_DEFINITIONS */
|