]> granicus.if.org Git - graphviz/commitdiff
once more into the breach to integrate the GDI+ plugin: must specify Platform SDK...
authorglenlow <devnull@localhost>
Tue, 4 Mar 2008 12:03:00 +0000 (12:03 +0000)
committerglenlow <devnull@localhost>
Tue, 4 Mar 2008 12:03:00 +0000 (12:03 +0000)
plugin/gdiplus/GdiPlusEnums.h.patch [new file with mode: 0644]
plugin/gdiplus/GdiPlusHeaders.h.patch [new file with mode: 0644]
plugin/gdiplus/GdiPlusImaging.h.patch [new file with mode: 0644]
plugin/gdiplus/GdiPlusimageAttributes.h.patch [new file with mode: 0644]

diff --git a/plugin/gdiplus/GdiPlusEnums.h.patch b/plugin/gdiplus/GdiPlusEnums.h.patch
new file mode 100644 (file)
index 0000000..68bd589
--- /dev/null
@@ -0,0 +1,15 @@
+--- /d/Program Files (x86)/Microsoft Visual Studio 8/VC/PlatformSDK/include/GdiPlusEnums.h     Thu Apr 14 16:54:44 2005
++++ ./GdiPlusEnums.h   Mon Feb 25 17:19:13 2008
+@@ -531,11 +531,9 @@
+ // We have to change the WMF record numbers so that they don't conflict with\r
+ // the EMF and EMF+ record numbers.\r
\r
+-enum EmfPlusRecordType;\r
+-\r
+ #define GDIP_EMFPLUS_RECORD_BASE        0x00004000\r
+ #define GDIP_WMF_RECORD_BASE            0x00010000\r
+-#define GDIP_WMF_RECORD_TO_EMFPLUS(n)   ((EmfPlusRecordType)((n) | GDIP_WMF_RECORD_BASE))\r
++#define GDIP_WMF_RECORD_TO_EMFPLUS(n)   ((n) | GDIP_WMF_RECORD_BASE)\r
+ #define GDIP_EMFPLUS_RECORD_TO_WMF(n)   ((n) & (~GDIP_WMF_RECORD_BASE))\r
+ #define GDIP_IS_WMF_RECORDTYPE(n)       (((n) & GDIP_WMF_RECORD_BASE) != 0)\r
\r
diff --git a/plugin/gdiplus/GdiPlusHeaders.h.patch b/plugin/gdiplus/GdiPlusHeaders.h.patch
new file mode 100644 (file)
index 0000000..fa7784e
--- /dev/null
@@ -0,0 +1,11 @@
+--- /d/Program Files (x86)/Microsoft Visual Studio 8/VC/PlatformSDK/include/GdiPlusHeaders.h   Thu Apr 14 16:54:44 2005
++++ ./GdiPlusHeaders.h Mon Feb 25 17:20:22 2008
+@@ -650,7 +650,7 @@
\r
+ class CachedBitmap : public GdiplusBase\r
+ {\r
+-    friend Graphics;\r
++    friend class Graphics;\r
\r
+ public:\r
+     CachedBitmap(IN Bitmap *bitmap,\r
diff --git a/plugin/gdiplus/GdiPlusImaging.h.patch b/plugin/gdiplus/GdiPlusImaging.h.patch
new file mode 100644 (file)
index 0000000..56448f5
--- /dev/null
@@ -0,0 +1,11 @@
+--- /d/Program Files (x86)/Microsoft Visual Studio 8/VC/PlatformSDK/include/GdiPlusImaging.h   Thu Apr 14 16:54:44 2005
++++ ./GdiPlusImaging.h Mon Feb 25 17:23:08 2008
+@@ -153,7 +153,7 @@
+     UINT Width;\r
+     UINT Height;\r
+     INT Stride;\r
+-    PixelFormat PixelFormat;\r
++    Gdiplus::PixelFormat PixelFormat;\r
+     VOID* Scan0;\r
+     UINT_PTR Reserved;\r
+ };\r
diff --git a/plugin/gdiplus/GdiPlusimageAttributes.h.patch b/plugin/gdiplus/GdiPlusimageAttributes.h.patch
new file mode 100644 (file)
index 0000000..6515d6c
--- /dev/null
@@ -0,0 +1,13 @@
+--- /d/Program Files (x86)/Microsoft Visual Studio 8/VC/PlatformSDK/include/GdiPlusimageAttributes.h   Thu Apr 14 16:54:44 2005
++++ ./GdiPlusimageAttributes.h Mon Feb 25 17:21:58 2008
+@@ -231,8 +231,8 @@
+                                             nativeImageAttr,\r
+                                             type,\r
+                                             FALSE,\r
+-                                            NULL,\r
+-                                            NULL));\r
++                                            (ARGB)0,\r
++                                            (ARGB)0));\r
+     }\r
\r
+     Status SetOutputChannel(\r