[mapserver-commits] r12924 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-12-27 06:48:58 -0800 (Tue, 27 Dec 2011)
New Revision: 12924

Modified:
   trunk/mapserver/mapserver.h
Log:
Revert to the SWIG friendly imageObj declaration

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2011-12-26 22:54:24 UTC (rev 12923)
+++ trunk/mapserver/mapserver.h	2011-12-27 14:48:58 UTC (rev 12924)
@@ -117,10 +117,8 @@
 /*forward declaration of rendering object*/
 typedef struct rendererVTableObj rendererVTableObj;
 typedef struct tileCacheObj tileCacheObj;
-typedef struct imageObj imageObj;
 
 
-
 /* ms_bitarray is used by the bit mask in mapbit.c */
 typedef ms_uint32 *     ms_bitarray;
 
@@ -1321,6 +1319,47 @@
 #endif /*SWIG*/
 
 /************************************************************************/
+/*                               imageObj                               */
+/*                                                                      */
+/*      A wrapper for GD and other images.                              */
+/************************************************************************/
+typedef struct {
+#ifdef SWIG
+%immutable;
+#endif
+  int width, height;
+  double resolution;
+  double resolutionfactor;
+
+  char *imagepath, *imageurl;
+
+  outputFormatObj *format;
+#ifndef SWIG
+  tileCacheObj *tilecache;
+  int ntiles;
+#endif
+#ifdef SWIG
+%mutable;
+#endif
+#ifndef SWIG
+  int size;
+#endif
+
+#ifndef SWIG
+  union {
+    void *plugin;
+
+    char *imagemap;
+    short *raw_16bit;
+    float *raw_float;
+    unsigned char *raw_byte;
+  } img;
+  ms_bitarray  img_mask;
+  pointObj refpt;
+#endif
+} imageObj;
+
+/************************************************************************/
 /*                               layerObj                               */
 /*                                                                      */
 /*      base unit of a map.                                             */
@@ -1605,48 +1644,6 @@
 } mapObj;
 
 /************************************************************************/
-/*                               imageObj                               */
-/*                                                                      */
-/*      A wrapper for GD and other images.                              */
-/************************************************************************/
-struct imageObj{
-#ifdef SWIG
-%immutable;
-#endif
-  int width, height;
-  double resolution;
-  double resolutionfactor;
-
-  char *imagepath, *imageurl;
-
-  outputFormatObj *format;
-#ifndef SWIG
-  tileCacheObj *tilecache;
-  int ntiles;
-#endif
-#ifdef SWIG
-%mutable;
-#endif
-#ifndef SWIG
-  int size;
-#endif
-
-#ifndef SWIG
-  union {
-    void *plugin;
-
-    char *imagemap;
-    short *raw_16bit;
-    float *raw_float;
-    unsigned char *raw_byte;
-  } img;
-  ms_bitarray  img_mask;
-  pointObj refpt;
-#endif
-};
-
-
-/************************************************************************/
 /*                             layerVTable                              */
 /*                                                                      */
 /*      contains function pointers to the layer operations.  If you     */