[mapserver-commits] r7788 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2008-07-07 15:55:02 -0400 (Mon, 07 Jul 2008)
New Revision: 7788

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maperror.c
Log:
Fixed problem with WMS INIMAGE exceptions vs AGG output formats (#2438)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-07-04 00:25:21 UTC (rev 7787)
+++ trunk/mapserver/HISTORY.TXT	2008-07-07 19:55:02 UTC (rev 7788)
@@ -13,6 +13,8 @@
 Current Version (SVN Trunk):
 ----------------------------
 
+- Fixed problem with WMS INIMAGE exceptions vs AGG output formats (#2438)
+
 - mapshape.c: Fixed integer pointer math being applied to uchars (#2667)
 
 - Fixed seg fault with saveImage() in PHP MapScript due to #2673 (#2677)

Modified: trunk/mapserver/maperror.c
===================================================================
--- trunk/mapserver/maperror.c	2008-07-04 00:25:21 UTC (rev 7787)
+++ trunk/mapserver/maperror.c	2008-07-07 19:55:02 UTC (rev 7788)
@@ -402,7 +402,9 @@
       format = map->outputformat;
   }
 
-  if (format == NULL) format = msCreateDefaultOutputFormat( NULL, "GD/PC256" );
+  /* Default to GIF if no suitable GD output format set */
+  if (format == NULL || !MS_DRIVER_GD(format)) 
+    format = msCreateDefaultOutputFormat( NULL, "GD/PC256" );
 
   img = gdImageCreate(width, height);
   color = gdImageColorAllocate(img, map->imagecolor.red,