Author: spouliot
Date: 2007-06-21 09:03:59 -0400 (Thu, 21 Jun 2007)
New Revision: 80461
Modified:
trunk/libgdiplus/src/ChangeLog
trunk/libgdiplus/src/GdiPlusFlat.h
trunk/libgdiplus/src/codecs.h
trunk/libgdiplus/src/dstream.c
trunk/libgdiplus/src/image.h
Log:
2007-06-21 Sebastien Pouliot <[EMAIL PROTECTED]>
* codecs.h, GdiPlusFlat.h, image.h, dstream.c: Fix #81845 to allow
using with C++ compilers and -Werror. Patch by Yves Bastide.
Modified: trunk/libgdiplus/src/ChangeLog
===================================================================
--- trunk/libgdiplus/src/ChangeLog 2007-06-21 13:01:14 UTC (rev 80460)
+++ trunk/libgdiplus/src/ChangeLog 2007-06-21 13:03:59 UTC (rev 80461)
@@ -1,3 +1,8 @@
+2007-06-21 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * codecs.h, GdiPlusFlat.h, image.h, dstream.c: Fix #81845 to allow
+ using with C++ compilers and -Werror. Patch by Yves Bastide.
+
2007-06-21 Sebastien Pouliot <[EMAIL PROTECTED]>
* graphics.h: Add missing GdipGetClip prototype. Fix #81844. Patch by
Modified: trunk/libgdiplus/src/GdiPlusFlat.h
===================================================================
--- trunk/libgdiplus/src/GdiPlusFlat.h 2007-06-21 13:01:14 UTC (rev 80460)
+++ trunk/libgdiplus/src/GdiPlusFlat.h 2007-06-21 13:03:59 UTC (rev 80461)
@@ -28,6 +28,11 @@
#ifndef _FLATAPI_H
#define _FLATAPI_H
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
/*
* If you ever need a workaround specific to libgdiplus then use the following
define
*/
@@ -74,11 +79,17 @@
UINT Width;
UINT Height;
INT Stride;
+ /* C++ compilers should need '::' (and GCC does) */
+#ifdef __cplusplus
+ ::PixelFormat PixelFormat;
+#else
PixelFormat PixelFormat;
+#endif
VOID *Scan0;
UINT *Reserved;
} BitmapData;
+#include "general.h"
#include "adjustablearrowcap.h"
#include "bitmap.h"
#include "brush.h"
@@ -89,6 +100,7 @@
#include "graphics.h"
#include "graphics-path.h"
#include "hatchbrush.h"
+#include "image.h"
#include "imageattributes.h"
#include "pen.h"
#include "matrix.h"
@@ -97,4 +109,8 @@
#include "stringformat.h"
#include "text.h"
+#ifdef __cplusplus
+}
#endif
+
+#endif
Modified: trunk/libgdiplus/src/codecs.h
===================================================================
--- trunk/libgdiplus/src/codecs.h 2007-06-21 13:01:14 UTC (rev 80460)
+++ trunk/libgdiplus/src/codecs.h 2007-06-21 13:03:59 UTC (rev 80461)
@@ -33,8 +33,8 @@
#ifndef __CODECS_H__
#define __CODECS_H__
+#include "win32structs.h"
#include "gdipenums.h"
-#include "win32structs.h"
typedef struct {
GUID Guid;
Modified: trunk/libgdiplus/src/dstream.c
===================================================================
--- trunk/libgdiplus/src/dstream.c 2007-06-21 13:01:14 UTC (rev 80460)
+++ trunk/libgdiplus/src/dstream.c 2007-06-21 13:03:59 UTC (rev 80461)
@@ -18,8 +18,8 @@
*
*/
+#include "gdiplus-private.h"
#include "dstream.h"
-#include "gdiplus-private.h"
struct _dstream_pvt {
GetBytesDelegate read;
Modified: trunk/libgdiplus/src/image.h
===================================================================
--- trunk/libgdiplus/src/image.h 2007-06-21 13:01:14 UTC (rev 80460)
+++ trunk/libgdiplus/src/image.h 2007-06-21 13:03:59 UTC (rev 80461)
@@ -31,7 +31,6 @@
#ifndef __IMAGE_H__
#define __IMAGE_H__
-#include "gdiplus-private.h"
#include "codecs.h"
/*
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
