Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Applied patch for bug 1660 to hide certain structures from Swig-based…

… MapScript.

git-svn-id: http://svn.osgeo.org/mapserver/trunk@5222 7532c77e-422f-0410-93f4-f0b67bdd69e2
  • Loading branch information...
commit 7499a27c385530752782bb06d3fba31ec44dac2a 1 parent 607348e
Steve Lime sdlime authored
7 cgiutil.h
@@ -28,6 +28,9 @@
28 28 ******************************************************************************
29 29 *
30 30 * $Log$
  31 + * Revision 1.18 2006/02/22 05:04:34 sdlime
  32 + * Applied patch for bug 1660 to hide certain structures from Swig-based MapScript.
  33 + *
31 34 * Revision 1.17 2005/06/14 16:03:33 dan
32 35 * Updated copyright date to 2005
33 36 *
@@ -80,7 +83,8 @@ typedef struct
80 83
81 84 /*
82 85 ** Function prototypes
83   -*/
  86 +*/
  87 +#ifndef SWIG
84 88 MS_DLL_EXPORT int loadParams(cgiRequestObj *);
85 89 MS_DLL_EXPORT void getword(char *, char *, char);
86 90 MS_DLL_EXPORT char *makeword_skip(char *, char, char);
@@ -97,5 +101,6 @@ MS_DLL_EXPORT void escape_shell_cmd(char *);
97 101
98 102 MS_DLL_EXPORT cgiRequestObj *msAllocCgiObj(void);
99 103 MS_DLL_EXPORT void msFreeCgiObj(cgiRequestObj *request);
  104 +#endif /*SWIG*/
100 105
101 106 #endif /* CGIUTIL_H */
18 map.h
@@ -28,6 +28,9 @@
28 28 ******************************************************************************
29 29 *
30 30 * $Log$
  31 + * Revision 1.444 2006/02/22 05:04:34 sdlime
  32 + * Applied patch for bug 1660 to hide certain structures from Swig-based MapScript.
  33 + *
31 34 * Revision 1.443 2006/02/18 20:59:12 sdlime
32 35 * Initial code for curved labels. (bug 1620)
33 36 *
@@ -588,6 +591,7 @@ extern "C" {
588 591 #define MS_FILE_DEFAULT MS_FILE_MAP
589 592
590 593
  594 +#ifndef SWIG
591 595 /* Filter object */
592 596 typedef enum
593 597 {
@@ -616,6 +620,7 @@ typedef struct _FilterNode
616 620
617 621
618 622 }FilterEncodingNode;
  623 +#endif /*SWIG*/
619 624
620 625
621 626 /* Label path object - used to hold path and bounds of curved labels - Bug #1620 implementation. */
@@ -1037,6 +1042,7 @@ typedef struct {
1037 1042 struct map_obj *map;
1038 1043 } legendObj;
1039 1044
  1045 +#ifndef SWIG
1040 1046 typedef struct
1041 1047 {
1042 1048 double dwhichlatitude;
@@ -1067,6 +1073,8 @@ typedef struct
1067 1073 struct layerVTable;
1068 1074 typedef struct layerVTable layerVTableObj;
1069 1075
  1076 +#endif /*SWIG*/
  1077 +
1070 1078 /* LAYER OBJECT - basic unit of a map */
1071 1079 typedef struct layer_obj {
1072 1080
@@ -1150,9 +1158,9 @@ typedef struct layer_obj {
1150 1158 char *plugin_library_original; /* this is needed for mapfile writing */
1151 1159 enum MS_CONNECTION_TYPE connectiontype;
1152 1160
  1161 +#ifndef SWIG
1153 1162 layerVTableObj *vtable;
1154 1163
1155   -#ifndef SWIG
1156 1164 struct layer_obj *sameconnection;
1157 1165 /* SDL has converted OracleSpatial, SDE, Graticules, MyGIS */
1158 1166 void *layerinfo; /* all connection types should use this generic pointer to a vendor specific structure */
@@ -1243,7 +1251,9 @@ typedef struct map_obj{ /* structure for a map */
1243 1251 double cellsize; /* in map units */
1244 1252
1245 1253
  1254 +#ifndef SWIG
1246 1255 geotransformObj gt; /* rotation / geotransform */
  1256 +#endif /*SWIG*/
1247 1257 rectObj saved_extent;
1248 1258
1249 1259 enum MS_UNITS units; /* units of the projection */
@@ -1253,7 +1263,9 @@ typedef struct map_obj{ /* structure for a map */
1253 1263 char *shapepath; /* where are the shape files located */
1254 1264 char *mappath; /* path of the mapfile, all path are relative to this path */
1255 1265
  1266 +#ifndef SWIG
1256 1267 paletteObj palette; /* holds a map palette */
  1268 +#endif /*SWIG*/
1257 1269 colorObj imagecolor; /* holds the initial image color value */
1258 1270
1259 1271 #ifdef SWIG
@@ -1301,6 +1313,7 @@ typedef struct {
1301 1313 } PDFObj;
1302 1314 #endif
1303 1315
  1316 +#ifndef SWIG
1304 1317 typedef struct {
1305 1318 mapObj *map;
1306 1319 FILE *stream;
@@ -1308,6 +1321,7 @@ typedef struct {
1308 1321 int streamclosed; /* track if a save image is done */
1309 1322 int compressed; /*track if output is set to be svgz */
1310 1323 } SVGObj;
  1324 +#endif /*SWIG*/
1311 1325
1312 1326 /* IMAGE OBJECT - a wrapper for GD images */
1313 1327 typedef struct {
@@ -1349,6 +1363,7 @@ typedef struct {
1349 1363 * If you add new functions to here, remember to update
1350 1364 * populateVirtualTable in maplayer.c
1351 1365 */
  1366 +#ifndef SWIG
1352 1367 struct layerVTable {
1353 1368 int (*LayerInitItemInfo)(layerObj *layer);
1354 1369 void (*LayerFreeItemInfo)(layerObj *layer);
@@ -1377,6 +1392,7 @@ struct layerVTable {
1377 1392 int (*LayerCreateItems)(layerObj *layer, int nt);
1378 1393 int (*LayerGetNumFeatures)(layerObj *layer);
1379 1394 };
  1395 +#endif /*SWIG*/
1380 1396
1381 1397
1382 1398 /* Function prototypes, wrapable */
15 maphash.h
@@ -28,6 +28,9 @@
28 28 ******************************************************************************
29 29 *
30 30 * $Log$
  31 + * Revision 1.10 2006/02/22 05:04:34 sdlime
  32 + * Applied patch for bug 1660 to hide certain structures from Swig-based MapScript.
  33 + *
31 34 * Revision 1.9 2005/06/14 16:03:33 dan
32 35 * Updated copyright date to 2005
33 36 *
@@ -55,21 +58,32 @@ extern "C" {
55 58 * Structs
56 59 * ========================================================================= */
57 60
  61 +#ifndef SWIG
58 62 struct hashObj {
59 63 struct hashObj *next; /* pointer to next item */
60 64 char *key; /* string key that is hashed */
61 65 char *data; /* string stored in this item */
62 66 };
  67 +#endif /*SWIG*/
63 68
64 69 typedef struct {
  70 +#ifndef SWIG
65 71 struct hashObj **items; /* the hash table */
  72 +#endif
  73 +#ifdef SWIG
  74 +%immutable;
  75 +#endif /*SWIG*/
66 76 int numitems; /* number of items */
  77 +#ifdef SWIG
  78 + %mutable;
  79 +#endif /*SWIG*/
67 80 } hashTableObj;
68 81
69 82 /* =========================================================================
70 83 * Functions
71 84 * ========================================================================= */
72 85
  86 +#ifndef SWIG
73 87 /* msCreateHashTable - create a hash table
74 88 * ARGS:
75 89 * None
@@ -141,6 +155,7 @@ MS_DLL_EXPORT const char *msFirstKeyFromHashTable( hashTableObj *table );
141 155 */
142 156 MS_DLL_EXPORT const char *msNextKeyFromHashTable( hashTableObj *table,
143 157 const char *prevkey );
  158 +#endif /*SWIG*/
144 159
145 160 #ifdef __cplusplus
146 161 }
5 mapprimitive.h
@@ -27,6 +27,9 @@
27 27 ******************************************************************************
28 28 *
29 29 * $Log$
  30 + * Revision 1.19 2006/02/22 05:04:34 sdlime
  31 + * Applied patch for bug 1660 to hide certain structures from Swig-based MapScript.
  32 + *
30 33 * Revision 1.18 2005/06/14 16:03:34 dan
31 34 * Updated copyright date to 2005
32 35 *
@@ -55,10 +58,12 @@ typedef struct {
55 58 double minx, miny, maxx, maxy;
56 59 } rectObj;
57 60
  61 +#ifndef SWIG
58 62 typedef struct {
59 63 double x;
60 64 double y;
61 65 } vectorObj;
  66 +#endif /*SWIG*/
62 67
63 68 typedef struct {
64 69 double x;
5 mapshape.h
@@ -27,6 +27,9 @@
27 27 ******************************************************************************
28 28 *
29 29 * $Log$
  30 + * Revision 1.35 2006/02/22 05:04:34 sdlime
  31 + * Applied patch for bug 1660 to hide certain structures from Swig-based MapScript.
  32 + *
30 33 * Revision 1.34 2005/06/14 16:03:34 dan
31 34 * Updated copyright date to 2005
32 35 *
@@ -178,6 +181,7 @@ typedef struct {
178 181 #endif
179 182 } shapefileObj;
180 183
  184 +#ifndef SWIG
181 185 /* layerInfo structure for tiled shapefiles */
182 186 typedef struct {
183 187 shapefileObj *shpfile;
@@ -185,7 +189,6 @@ typedef struct {
185 189 int tilelayerindex;
186 190 } msTiledSHPLayerInfo;
187 191
188   -#ifndef SWIG
189 192
190 193 /* shapefileObj function prototypes */
191 194 MS_DLL_EXPORT int msSHPOpenFile(shapefileObj *shpfile, char *mode, char *filename);

0 comments on commit 7499a27

Please sign in to comment.
Something went wrong with that request. Please try again.