[mapserver-commits] r10847 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-01-10 09:02:32 -0800 (Mon, 10 Jan 2011)
New Revision: 10847

Modified:
   trunk/mapserver/mapoutput.c
Log:
remove gd/wbmp. Add svg,pdf as part of wms getmap formats #3653

Modified: trunk/mapserver/mapoutput.c
===================================================================
--- trunk/mapserver/mapoutput.c	2011-01-07 17:52:30 UTC (rev 10846)
+++ trunk/mapserver/mapoutput.c	2011-01-10 17:02:32 UTC (rev 10847)
@@ -357,9 +357,6 @@
     if( msSelectOutputFormat( map, "png" ) == NULL )
         msCreateDefaultOutputFormat( map, "GD/PNG" );
 
-    if( msSelectOutputFormat( map, "wbmp" ) == NULL )
-        msCreateDefaultOutputFormat( map, "GD/WBMP" );
-
     if( msSelectOutputFormat( map, "png24" ) == NULL )
         msCreateDefaultOutputFormat( map, "AGG/PNG" );
     
@@ -954,7 +951,8 @@
                (strncasecmp(map->outputformatlist[i]->driver, "GD/", 3)==0 ||
                 strncasecmp(map->outputformatlist[i]->driver, "GDAL/", 5)==0 ||
                 strncasecmp(map->outputformatlist[i]->driver, "AGG/", 4)==0 ||
-                strcasecmp(map->outputformatlist[i]->driver, "svg")==0 ||
+                strcasecmp(map->outputformatlist[i]->driver, "CAIRO/SVG")==0 ||
+                strcasecmp(map->outputformatlist[i]->driver, "CAIRO/PDF")==0 ||
                 strcasecmp(map->outputformatlist[i]->driver, "kml")==0 ||
                 strcasecmp(map->outputformatlist[i]->driver, "kmz")==0))
               mime_list[mime_count++] = map->outputformatlist[i]->mimetype;