[mapserver-commits] r7723 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2008-06-21 09:05:04 -0400 (Sat, 21 Jun 2008)
New Revision: 7723

Modified:
   trunk/mapserver/mapserv.c
   trunk/mapserver/maptemplate.c
Log:
Fixed a problem with munged arguments to msGenerateImages() that was preventing mode=BROWSE applications from creating images. (#2655)

Modified: trunk/mapserver/mapserv.c
===================================================================
--- trunk/mapserver/mapserv.c	2008-06-20 18:53:10 UTC (rev 7722)
+++ trunk/mapserver/mapserv.c	2008-06-21 13:05:04 UTC (rev 7723)
@@ -1346,9 +1346,7 @@
     if(mapserv->Mode == BROWSE) {
 
       if(!mapserv->map->web.template) {
-        msSetError(MS_WEBERR, 
-                   "Traditional BROWSE mode requires a TEMPLATE in the WEB section, but none was provided.", 
-                   "mapserv()");
+        msSetError(MS_WEBERR, "Traditional BROWSE mode requires a TEMPLATE in the WEB section, but none was provided.", "mapserv()");
         writeError();
       }
 
@@ -1363,7 +1361,7 @@
       /* -------------------------------------------------------------------- */
       /*      generate map, legend, scalebar and refernce images.             */
       /* -------------------------------------------------------------------- */
-      if(msGenerateImages(mapserv, MS_TRUE, MS_TRUE) == MS_FALSE)
+      if(msGenerateImages(mapserv, MS_FALSE, MS_TRUE) == MS_FALSE)
         writeError();
       
       if(QueryFile) {
@@ -1427,10 +1425,9 @@
       }
 
       if(mapserv->sendheaders) msIO_printf("Content-type: %s%c%c", MS_IMAGE_MIME_TYPE(mapserv->map->outputformat), 10,10);
-      
-      
+            
       if( mapserv->Mode == MAP || mapserv->Mode == TILE )
-        status = msSaveImage(mapserv->map,img, NULL);
+        status = msSaveImage(mapserv->map, img, NULL);
       else
         status = msSaveImage(NULL,img, NULL);
           

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2008-06-20 18:53:10 UTC (rev 7722)
+++ trunk/mapserver/maptemplate.c	2008-06-21 13:05:04 UTC (rev 7723)
@@ -225,7 +225,7 @@
   */ 
   if(mapserv->map->querymap.status) {
     checkWebScale(mapserv);
-    msGenerateImages(mapserv, MS_FALSE, MS_TRUE);
+    msGenerateImages(mapserv, MS_TRUE, MS_TRUE);
   }
 
   /* initialize the buffer if necessary */
@@ -4037,7 +4037,7 @@
     }
 
     if(bGenerateImages)
-      msGenerateImages(mapserv, MS_FALSE, MS_TRUE);
+      msGenerateImages(mapserv, MS_TRUE, MS_FALSE);
 
     msReturnTemplateQuery(mapserv, NULL, &pszBuffer );