[mapserver-commits] r8821 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-03-25 10:26:21 -0400 (Wed, 25 Mar 2009)
New Revision: 8821

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/mapoutput.c
Log:
 WMS GetImage and GetLegendGraphic formats should advertise AGG driver (#2957)

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-03-24 13:21:13 UTC (rev 8820)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-03-25 14:26:21 UTC (rev 8821)
@@ -12,6 +12,8 @@
 Current Version:
 ----------------
 
+- WMS GetImage and GetLegendGraphic formats should advertise AGG driver (#2957)
+
 - PHP: add missing binding constant (#2949)
 
 - SLD: Correct non validating SLD (#2915)

Modified: branches/branch-5-4/mapserver/mapoutput.c
===================================================================
--- branches/branch-5-4/mapserver/mapoutput.c	2009-03-24 13:21:13 UTC (rev 8820)
+++ branches/branch-5-4/mapserver/mapoutput.c	2009-03-25 14:26:21 UTC (rev 8821)
@@ -823,7 +823,8 @@
         }
 
         if( j == mime_count && map->outputformatlist[i]->driver &&
-            strncasecmp(map->outputformatlist[i]->driver, "GD/", 3)==0)
+            (strncasecmp(map->outputformatlist[i]->driver, "GD/", 3)==0 ||
+             strncasecmp(map->outputformatlist[i]->driver, "AGG/", 4)==0))
             mime_list[mime_count++] = map->outputformatlist[i]->mimetype;
     }
 
@@ -857,6 +858,7 @@
 
         if( j == mime_count && map->outputformatlist[i]->driver &&
             (strncasecmp(map->outputformatlist[i]->driver, "GD/", 3)==0 ||
+             strncasecmp(map->outputformatlist[i]->driver, "AGG/", 4)==0 ||
              strncasecmp(map->outputformatlist[i]->driver, "GDAL/", 5)==0 ||
              strcasecmp(map->outputformatlist[i]->driver, "svg")==0)) 
             mime_list[mime_count++] = map->outputformatlist[i]->mimetype;