From e367ff0f1f521d3b23d145be7e75fc01355e884b Mon Sep 17 00:00:00 2001
From: glenlow <devnull@localhost>
Date: Tue, 4 Mar 2008 12:03:00 +0000
Subject: [PATCH] once more into the breach to integrate the GDI+ plugin: must
 specify Platform SDK directories during configure, correct dependency rules
 for patched/unpatched headers, pass GDI+ import library direct to linker

---
 plugin/gdiplus/GdiPlusEnums.h.patch           | 15 +++++++++++++++
 plugin/gdiplus/GdiPlusHeaders.h.patch         | 11 +++++++++++
 plugin/gdiplus/GdiPlusImaging.h.patch         | 11 +++++++++++
 plugin/gdiplus/GdiPlusimageAttributes.h.patch | 13 +++++++++++++
 4 files changed, 50 insertions(+)
 create mode 100644 plugin/gdiplus/GdiPlusEnums.h.patch
 create mode 100644 plugin/gdiplus/GdiPlusHeaders.h.patch
 create mode 100644 plugin/gdiplus/GdiPlusImaging.h.patch
 create mode 100644 plugin/gdiplus/GdiPlusimageAttributes.h.patch

diff --git a/plugin/gdiplus/GdiPlusEnums.h.patch b/plugin/gdiplus/GdiPlusEnums.h.patch
new file mode 100644
index 000000000..68bd5896f
--- /dev/null
+++ b/plugin/gdiplus/GdiPlusEnums.h.patch
@@ -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
+ // the EMF and EMF+ record numbers.
+ 
+-enum EmfPlusRecordType;
+-
+ #define GDIP_EMFPLUS_RECORD_BASE        0x00004000
+ #define GDIP_WMF_RECORD_BASE            0x00010000
+-#define GDIP_WMF_RECORD_TO_EMFPLUS(n)   ((EmfPlusRecordType)((n) | GDIP_WMF_RECORD_BASE))
++#define GDIP_WMF_RECORD_TO_EMFPLUS(n)   ((n) | GDIP_WMF_RECORD_BASE)
+ #define GDIP_EMFPLUS_RECORD_TO_WMF(n)   ((n) & (~GDIP_WMF_RECORD_BASE))
+ #define GDIP_IS_WMF_RECORDTYPE(n)       (((n) & GDIP_WMF_RECORD_BASE) != 0)
+ 
diff --git a/plugin/gdiplus/GdiPlusHeaders.h.patch b/plugin/gdiplus/GdiPlusHeaders.h.patch
new file mode 100644
index 000000000..fa7784e52
--- /dev/null
+++ b/plugin/gdiplus/GdiPlusHeaders.h.patch
@@ -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 @@
+ 
+ class CachedBitmap : public GdiplusBase
+ {
+-    friend Graphics;
++    friend class Graphics;
+ 
+ public:
+     CachedBitmap(IN Bitmap *bitmap,
diff --git a/plugin/gdiplus/GdiPlusImaging.h.patch b/plugin/gdiplus/GdiPlusImaging.h.patch
new file mode 100644
index 000000000..56448f5f5
--- /dev/null
+++ b/plugin/gdiplus/GdiPlusImaging.h.patch
@@ -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;
+     UINT Height;
+     INT Stride;
+-    PixelFormat PixelFormat;
++    Gdiplus::PixelFormat PixelFormat;
+     VOID* Scan0;
+     UINT_PTR Reserved;
+ };
diff --git a/plugin/gdiplus/GdiPlusimageAttributes.h.patch b/plugin/gdiplus/GdiPlusimageAttributes.h.patch
new file mode 100644
index 000000000..6515d6c31
--- /dev/null
+++ b/plugin/gdiplus/GdiPlusimageAttributes.h.patch
@@ -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,
+                                             type,
+                                             FALSE,
+-                                            NULL,
+-                                            NULL));
++                                            (ARGB)0,
++                                            (ARGB)0));
+     }
+ 
+     Status SetOutputChannel(
-- 
2.40.0