[mapserver-commits] r11141 - trunk/mapserver/mapscript/php
svn at osgeo.org
svn at osgeo.org
Thu Mar 10 13:43:33 EST 2011
Author: assefa
Date: 2011-03-10 10:43:32 -0800 (Thu, 10 Mar 2011)
New Revision: 11141
Modified:
trunk/mapserver/mapscript/php/class.c
trunk/mapserver/mapscript/php/grid.c
trunk/mapserver/mapscript/php/image.c
trunk/mapserver/mapscript/php/layer.c
trunk/mapserver/mapscript/php/line.c
trunk/mapserver/mapscript/php/map.c
trunk/mapserver/mapscript/php/owsrequest.c
trunk/mapserver/mapscript/php/php_mapscript.c
trunk/mapserver/mapscript/php/php_mapscript_util.h
trunk/mapserver/mapscript/php/shape.c
trunk/mapserver/mapscript/php/shapefile.c
trunk/mapserver/mapscript/php/style.c
trunk/mapserver/mapscript/php/symbol.c
Log:
fix windows build #3714
Modified: trunk/mapserver/mapscript/php/class.c
===================================================================
--- trunk/mapserver/mapscript/php/class.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/class.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -111,6 +111,7 @@
classObj *class;
php_layer_object *php_layer;
php_class_object *php_class, *php_class2;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|O",
@@ -383,6 +384,7 @@
zval *zobj = getThis();
php_class_object *php_class;
styleObj *style = NULL;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
Modified: trunk/mapserver/mapscript/php/grid.c
===================================================================
--- trunk/mapserver/mapscript/php/grid.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/grid.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -53,6 +53,7 @@
zval *zlayer;
php_layer_object *php_layer;
php_grid_object *php_grid, *php_old_grid;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
Modified: trunk/mapserver/mapscript/php/image.c
===================================================================
--- trunk/mapserver/mapscript/php/image.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/image.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -209,7 +209,7 @@
return;
}
-#ifdef USE_AGG
+#ifdef undef //USE_AGG
if( MS_RENDERER_AGG(php_imageSrc->image->format))
msAlphaAGG2GD(php_imageSrc->image);
if( MS_RENDERER_AGG(php_image->image->format))
Modified: trunk/mapserver/mapscript/php/layer.c
===================================================================
--- trunk/mapserver/mapscript/php/layer.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/layer.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -182,6 +182,7 @@
int index;
php_map_object *php_map;
php_layer_object *php_layer, *php_layer2;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|O",
@@ -672,6 +673,7 @@
long index;
classObj *class = NULL;
php_layer_object *php_layer;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -945,6 +947,7 @@
long index;
resultObj *result = NULL;
php_layer_object *php_layer;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -1045,6 +1048,7 @@
zval *zobj = getThis();
shapeObj *shape = NULL;
php_layer_object *php_layer;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters_none() == FAILURE) {
@@ -1093,6 +1097,7 @@
zval *zobj = getThis();
rectObj *rect = NULL;
php_layer_object *php_layer;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters_none() == FAILURE) {
@@ -1584,6 +1589,7 @@
long index;
classObj *class;
php_layer_object *php_layer;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -1837,6 +1843,7 @@
shapeObj *shape = NULL;
php_result_object *php_result;
php_layer_object *php_layer;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
Modified: trunk/mapserver/mapscript/php/line.c
===================================================================
--- trunk/mapserver/mapscript/php/line.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/line.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -279,6 +279,7 @@
zval *zobj = getThis();
php_line_object *php_line;
long index;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &index) == FAILURE) {
Modified: trunk/mapserver/mapscript/php/map.c
===================================================================
--- trunk/mapserver/mapscript/php/map.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/map.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -480,6 +480,7 @@
long symbolId;
symbolObj *symbol = NULL;
php_map_object *php_map;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -805,6 +806,7 @@
long index;
layerObj *layer = NULL;
php_map_object *php_map;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -839,6 +841,7 @@
long layerName_len;
layerObj *layer = NULL;
php_map_object *php_map;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
@@ -873,6 +876,7 @@
paletteObj palette;
colorObj color;
php_map_object *php_map;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -3231,6 +3235,7 @@
long index = -1;
layerObj *layer = NULL;
php_map_object *php_map;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -3263,6 +3268,7 @@
long index = -1;
labelCacheMemberObj *labelCacheMember = NULL;
php_map_object *php_map;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -3300,6 +3306,7 @@
zval *zobj = getThis();
rectObj geoRefExt;
php_map_object *php_map;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters_none() == FAILURE) {
Modified: trunk/mapserver/mapscript/php/owsrequest.c
===================================================================
--- trunk/mapserver/mapscript/php/owsrequest.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/owsrequest.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -162,12 +162,12 @@
thread_context = NULL;
#endif
- PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
+ //PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters_none() == FAILURE) {
- PHP_MAPSCRIPT_RESTORE_ERRORS(TRUE);
+ //PHP_MAPSCRIPT_RESTORE_ERRORS(TRUE);
return;
}
- PHP_MAPSCRIPT_RESTORE_ERRORS(TRUE);
+ //PHP_MAPSCRIPT_RESTORE_ERRORS(TRUE);
php_owsrequest = (php_owsrequest_object *) zend_object_store_get_object(zobj TSRMLS_CC);
Modified: trunk/mapserver/mapscript/php/php_mapscript.c
===================================================================
--- trunk/mapserver/mapscript/php/php_mapscript.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/php_mapscript.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -188,6 +188,7 @@
int index;
php_map_object *php_map;
php_layer_object *php_layer;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|O",
@@ -229,6 +230,7 @@
char *projString;
long projString_len;
projectionObj *projection = NULL;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
@@ -278,6 +280,7 @@
PHP_FUNCTION(ms_newPointObj)
{
pointObj *point = NULL;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters_none() == FAILURE) {
@@ -336,6 +339,7 @@
styleObj *style;
php_class_object *php_class;
php_style_object *php_style;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|O",
@@ -369,6 +373,7 @@
classObj *class;
php_layer_object *php_layer;
php_class_object *php_class;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|O",
@@ -537,6 +542,7 @@
zval *zlayer;
php_layer_object *php_layer;
php_grid_object *php_grid;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
Modified: trunk/mapserver/mapscript/php/php_mapscript_util.h
===================================================================
--- trunk/mapserver/mapscript/php/php_mapscript_util.h 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/php_mapscript_util.h 2011-03-10 18:43:32 UTC (rev 11141)
@@ -87,7 +87,6 @@
MAPSCRIPT_DELREF(parent.val);
#define MAPSCRIPT_MAKE_PARENT(zobj, ptr) \
- parent_object parent; \
parent.val = zobj; \
parent.child_ptr = ptr;
Modified: trunk/mapserver/mapscript/php/shape.c
===================================================================
--- trunk/mapserver/mapscript/php/shape.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/shape.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -149,6 +149,7 @@
zval *zobj = getThis();
php_shape_object *php_shape;
long type;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -273,6 +274,7 @@
zval *zobj = getThis();
long index;
php_shape_object *php_shape;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -391,6 +393,7 @@
double measure;
pointObj *point = NULL;
php_shape_object *php_shape;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d",
@@ -422,6 +425,7 @@
pointObj *intersection = NULL;
php_shape_object *php_shape;
php_point_object *php_point;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
@@ -489,6 +493,7 @@
double width;
shapeObj *shape = NULL;
php_shape_object *php_shape;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d",
@@ -517,6 +522,7 @@
zval *zobj = getThis();
shapeObj *shape = NULL;
php_shape_object *php_shape;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters_none() == FAILURE) {
@@ -544,6 +550,7 @@
zval *zobj = getThis();
shapeObj *shape = NULL;
php_shape_object *php_shape;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters_none() == FAILURE) {
@@ -602,6 +609,7 @@
zval *zshape;
shapeObj *shape;
php_shape_object *php_shape, *php_shape2;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
@@ -633,6 +641,7 @@
zval *zshape;
shapeObj *shape;
php_shape_object *php_shape, *php_shape2;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
@@ -664,6 +673,7 @@
zval *zshape;
shapeObj *shape;
php_shape_object *php_shape, *php_shape2;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
@@ -695,6 +705,7 @@
zval *zshape;
shapeObj *shape;
php_shape_object *php_shape, *php_shape2;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O",
@@ -899,6 +910,7 @@
zval *zobj = getThis();
pointObj *point;
php_shape_object *php_shape;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters_none() == FAILURE) {
@@ -972,6 +984,7 @@
zval *zobj = getThis();
pointObj *point;
php_shape_object *php_shape;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters_none() == FAILURE) {
@@ -1054,6 +1067,7 @@
double tolerance;
shapeObj *shape = NULL;
php_shape_object *php_shape;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d",
@@ -1083,6 +1097,7 @@
double tolerance;
shapeObj *shape = NULL;
php_shape_object *php_shape;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d",
Modified: trunk/mapserver/mapscript/php/shapefile.c
===================================================================
--- trunk/mapserver/mapscript/php/shapefile.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/shapefile.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -168,6 +168,7 @@
long index;
shapeObj *shape;
php_shapefile_object *php_shapefile;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -209,6 +210,7 @@
long index;
pointObj *point;
php_shapefile_object *php_shapefile;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
@@ -347,6 +349,7 @@
php_shapefile_object *php_shapefile;
php_map_object *php_map;
shapeObj *shape = NULL;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ol",
Modified: trunk/mapserver/mapscript/php/style.c
===================================================================
--- trunk/mapserver/mapscript/php/style.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/style.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -79,6 +79,7 @@
styleObj *style;
php_class_object *php_class;
php_style_object *php_style, *php_style2;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|O",
Modified: trunk/mapserver/mapscript/php/symbol.c
===================================================================
--- trunk/mapserver/mapscript/php/symbol.c 2011-03-10 16:11:36 UTC (rev 11140)
+++ trunk/mapserver/mapscript/php/symbol.c 2011-03-10 18:43:32 UTC (rev 11141)
@@ -69,6 +69,7 @@
int symbolId = -1;
php_symbol_object *php_symbol;
php_map_object *php_map;
+ parent_object parent;
PHP_MAPSCRIPT_ERROR_HANDLING(TRUE);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Os",
More information about the mapserver-commits
mailing list