[mapserver-commits] r10038 - in trunk/mapserver: . mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2010-04-01 11:21:30 -0400 (Thu, 01 Apr 2010)
New Revision: 10038

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/php/image.c
Log:
Fixed PHP/MapScript imageObj->saveImage() function (#3410)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-04-01 14:49:02 UTC (rev 10037)
+++ trunk/mapserver/HISTORY.TXT	2010-04-01 15:21:30 UTC (rev 10038)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed PHP/MapScript imageObj->saveImage() function (#3410)
+
 - Implement wms_nonsquare_ok metadata item for WMS servers that do
   not support non-square pixels (#3409)
 

Modified: trunk/mapserver/mapscript/php/image.c
===================================================================
--- trunk/mapserver/mapscript/php/image.c	2010-04-01 14:49:02 UTC (rev 10037)
+++ trunk/mapserver/mapscript/php/image.c	2010-04-01 15:21:30 UTC (rev 10038)
@@ -151,6 +151,7 @@
     if (msSaveImage(NULL, php_image->image, imageFile) != MS_SUCCESS)
     {
         mapscript_throw_mapserver_exception("Failed writing image to %s" TSRMLS_CC, imageFile);
+        return;
     }
 
     imageUrlFull = msBuildPath(path, php_image->image->imageurl, imageFilename);
@@ -286,6 +287,8 @@
             mapscript_throw_mapserver_exception("Failed writing image to %s" TSRMLS_CC, filename);
             return;
         }
+
+        RETURN_LONG(status);
     }
 
     /* no filename - read stdout */