Permalink
Browse files

2007-06-21 Sebastien Pouliot <sebastien@ximian.com>

	* codecs.h, GdiPlusFlat.h, image.h, dstream.c: Fix #81845 to allow 
	using with C++ compilers and -Werror. Patch by Yves Bastide.


svn path=/trunk/libgdiplus/; revision=80461
  • Loading branch information...
1 parent c62ea3f commit 98ffc909aeff56ba73f2475ab9a6f40c665bdc95 Sebastien Pouliot committed Jun 21, 2007
Showing with 23 additions and 3 deletions.
  1. +5 −0 src/ChangeLog
  2. +16 −0 src/GdiPlusFlat.h
  3. +1 −1 src/codecs.h
  4. +1 −1 src/dstream.c
  5. +0 −1 src/image.h
View
@@ -1,3 +1,8 @@
+2007-06-21 Sebastien Pouliot <sebastien@ximian.com>
+
+ * 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 <sebastien@ximian.com>
* graphics.h: Add missing GdipGetClip prototype. Fix #81844. Patch by
View
@@ -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 @@ typedef struct {
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 @@ typedef struct {
#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 @@ typedef struct {
#include "stringformat.h"
#include "text.h"
+#ifdef __cplusplus
+}
+#endif
+
#endif
View
@@ -33,8 +33,8 @@
#ifndef __CODECS_H__
#define __CODECS_H__
-#include "gdipenums.h"
#include "win32structs.h"
+#include "gdipenums.h"
typedef struct {
GUID Guid;
View
@@ -18,8 +18,8 @@
*
*/
-#include "dstream.h"
#include "gdiplus-private.h"
+#include "dstream.h"
struct _dstream_pvt {
GetBytesDelegate read;
View
@@ -31,7 +31,6 @@
#ifndef __IMAGE_H__
#define __IMAGE_H__
-#include "gdiplus-private.h"
#include "codecs.h"
/*

0 comments on commit 98ffc90

Please sign in to comment.