[mapserver-commits] r11217 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-03-18 06:33:17 -0700 (Fri, 18 Mar 2011)
New Revision: 11217

Modified:
   trunk/mapserver/mapoutput.c
Log:
remove unwanted  change to driver names

Modified: trunk/mapserver/mapoutput.c
===================================================================
--- trunk/mapserver/mapoutput.c	2011-03-17 20:00:08 UTC (rev 11216)
+++ trunk/mapserver/mapoutput.c	2011-03-18 13:33:17 UTC (rev 11217)
@@ -184,8 +184,8 @@
 #ifdef USE_GD_PNG
     if( strcasecmp(driver,"GD/PNG") == 0 )
     {
-        format = msAllocOutputFormat( map, "png8", driver );
-        format->mimetype = msStrdup("image/png; mode=8bit");
+        format = msAllocOutputFormat( map, "png", driver );
+        format->mimetype = msStrdup("image/png");
         format->imagemode = MS_IMAGEMODE_PC256;
         format->extension = msStrdup("png");
         format->renderer = MS_RENDER_WITH_GD;
@@ -194,14 +194,6 @@
 
     if( strcasecmp(driver,"AGG/PNG") == 0 )
     {
-        format = msAllocOutputFormat( map, "png", driver );
-        format->mimetype = msStrdup("image/png");
-        format->imagemode = MS_IMAGEMODE_RGB;
-        format->extension = msStrdup("png");
-        format->renderer = MS_RENDER_WITH_AGG;
-    }
-    if( strcasecmp(driver,"AGG/PNG") == 0 )
-    {
         format = msAllocOutputFormat( map, "png24", driver );
         format->mimetype = msStrdup("image/png; mode=24bit");
         format->imagemode = MS_IMAGEMODE_RGB;