From: ellson <devnull@localhost>
Date: Mon, 3 Mar 2008 16:10:47 +0000 (+0000)
Subject: try a different technique for getting and patching gdiplus headers
X-Git-Tag: LAST_LIBGRAPH~32^2~4602
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cedf69c33a601e20804f1532d5caa6fefa197ce6;p=graphviz

try a different technique for getting and patching gdiplus headers
---

diff --git a/plugin/gdiplus/GdiPlusEnums.h.patch b/plugin/gdiplus/GdiPlusEnums.h.patch
deleted file mode 100644
index 68bd5896f..000000000
--- a/plugin/gdiplus/GdiPlusEnums.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- /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
deleted file mode 100644
index fa7784e52..000000000
--- a/plugin/gdiplus/GdiPlusHeaders.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /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
deleted file mode 100644
index 56448f5f5..000000000
--- a/plugin/gdiplus/GdiPlusImaging.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /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
deleted file mode 100644
index 6515d6c31..000000000
--- a/plugin/gdiplus/GdiPlusimageAttributes.h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /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(
diff --git a/plugin/gdiplus/Makefile.am b/plugin/gdiplus/Makefile.am
index 071fc710c..19c0bfa73 100644
--- a/plugin/gdiplus/Makefile.am
+++ b/plugin/gdiplus/Makefile.am
@@ -18,11 +18,6 @@ pkglib_LTLIBRARIES = libgvplugin_gdiplus.la
 endif
 endif
 
-nodist_libgvplugin_gdiplus_C_la_SOURCES = \
-	GdiPlusEnums.h \
-	GdiPlusHeaders.h \
-	GdiPlusImaging.h \
-	GdiPlusimageAttributes.h
 libgvplugin_gdiplus_C_la_SOURCES = \
 	gvplugin_gdiplus.cpp \
 	gvrender_gdiplus.cpp
@@ -36,20 +31,12 @@ if WITH_WIN32
 libgvplugin_gdiplus_la_LDFLAGS += -no-undefined
 endif
 
-# these targets are built on the build platform, not on the dist platform,
-#    because they are included in the nodist...SOURCES list above
-GdiPlusEnums.h : $(GDIPLUS_PLATFORMSDK)/include/GdiPlusEnums.h GdiPlusEnums.h.patch
-	cp $(GDIPLUS_PLATFORMSDK)/include/GdiPlusEnums.h .
-	patch -p0 < GdiPlusEnums.h.patch
+libgvplugin_gdiplus.la libgvplugin_gdiplus_C.la: GdiPlusHeaders
 
-GdiPlusHeaders.h : $(GDIPLUS_PLATFORMSDK)/include/GdiPlusHeaders.h GdiPlusHeaders.h.patch
-	cp $(GDIPLUS_PLATFORMSDK)/include/GdiPlusHeaders.h .
-	patch -p0 < GdiPlusHeaders.h.patch
+# these targets are created on the build platform, not on the dist platform
+.PHONY: GdiPlusHeaders
+GdiPlusHeaders: gdiplus.diff
+	cp $(GDIPLUS_PLATFORMSDK)/include/*.h .
+	patch -p0 < gdiplus.diff
 
-GdiPlusImaging.h : $(GDIPLUS_PLATFORMSDK)/include/GdiPlusImaging.h GdiPlusImaging.h.patch
-	cp $(GDIPLUS_PLATFORMSDK)/include/GdiPlusImaging.h .
-	patch -p0 < GdiPlusImaging.h.patch
-
-GdiPlusimageAttributes.h : $(GDIPLUS_PLATFORMSDK)/include/GdiPlusimageAttributes.h GdiPlusimageAttributes.h.patch
-	cp $(GDIPLUS_PLATFORMSDK)/include/GdiPlusimageAttributes.h .
-	patch -p0 < GdiPlusimageAttributes.h.patch
+EXTRA_DIST = gdiplus.diff
diff --git a/plugin/gdiplus/gdiplus.diff b/plugin/gdiplus/gdiplus.diff
new file mode 100755
index 000000000..2ce56554b
--- /dev/null
+++ b/plugin/gdiplus/gdiplus.diff
@@ -0,0 +1,50 @@
+--- /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)
+ 
+--- /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,
+--- /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;
+ };
+--- /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(