[mapserver-commits] r11106 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-03-07 06:41:36 -0800 (Mon, 07 Mar 2011)
New Revision: 11106

Modified:
   trunk/mapserver/maperror.c
   trunk/mapserver/mapwms.c
Log:
remove reference to wbmp #3653

Modified: trunk/mapserver/maperror.c
===================================================================
--- trunk/mapserver/maperror.c	2011-03-06 22:25:49 UTC (rev 11105)
+++ trunk/mapserver/maperror.c	2011-03-07 14:41:36 UTC (rev 11106)
@@ -508,9 +508,6 @@
 #ifdef USE_GD_JPEG
   strcat(version, " OUTPUT=JPEG");
 #endif
-#ifdef USE_GD_WBMP
-  strcat(version, " OUTPUT=WBMP");
-#endif
 #ifdef USE_PDF
   strcat(version, " OUTPUT=PDF");
 #endif

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2011-03-06 22:25:49 UTC (rev 11105)
+++ trunk/mapserver/mapwms.c	2011-03-07 14:41:36 UTC (rev 11106)
@@ -1754,11 +1754,7 @@
                            if (!mimetype)
                              mimetype = msEncodeHTMLEntities("image/jpeg");
 #endif
-#ifdef USE_GD_WBMP
                            if (!mimetype)
-                             mimetype = msEncodeHTMLEntities("image/vnd.wap.wbmp");
-#endif
-                           if (!mimetype)
                                mimetype = msEncodeHTMLEntities(MS_IMAGE_MIME_TYPE(map->outputformat));
 
                            /* -------------------------------------------------------------------- */
@@ -2225,9 +2221,6 @@
 #ifdef USE_GD_JPEG
                       "<JPEG />"
 #endif
-#ifdef USE_GD_WBMP
-                      "<WBMP />"
-#endif
                        "<SVG />"  
                       , NULL);
     msWMSPrintRequestCap(nVersion, "Capabilities", script_url_encoded, "<WMS_XML />", NULL);