Merge branch 'branch-6-0' into branch-6-2

Conflicts: mapogr.cpp mapscript/php/image.c mapscript/php/php_mapscript.c mapscript/php/php_mapscript_util.c mapsymbol.c mapwcs11.c mapwcs20.c
MapServer · Aug 28, 2012 · 6961ebb · 6961ebb
2 parents 7266535 + b89c07e
commit 6961ebb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/HISTORY.TXT b/HISTORY.TXT
@@ -34,6 +34,12 @@ Version 6.2 (beta1: 20120629):
 
 - Fix wms_enable_request-related errors are not properly tagged (#4187)
 
+- Fixed "msGetMarkerSize() called on unloaded pixmap symbol" in mapsymbol.c (#4225)
+
+- Fixed PHP MapScript support for PHP 5.4 (#4309)
+
+- Fix msOGREscapeSQLParam could return random data (#4335)
+
 - Fixed locations of supported and native formats in Capabilities and CoverageDescriptions for WCS 2.0 (#4003)
 
 - Made format parameter for WCS 2.0 GetCoverage requests optional (#4003)

diff --git a/mapwcs11.c b/mapwcs11.c
@@ -136,6 +136,14 @@ static char *msWCSGetFormatsList11( mapObj *map, layerObj *layer )
     tokens = msStringSplit(value, ' ', &numtokens);
   }
 
+  /* -------------------------------------------------------------------- */
+  /*      Parse from map.web metadata.                                    */
+  /* -------------------------------------------------------------------- */
+  else if((value = msOWSGetEncodeMetadata( &(map->web.metadata), "CO", "formats",
+                                           NULL)) != NULL ) {
+    tokens = msStringSplit(value, ' ', &numtokens);
+  }
+
   /* -------------------------------------------------------------------- */
   /*      Or generate from all configured raster output formats that      */
   /*      look plausible.                                                 */

diff --git a/mapwcs20.c b/mapwcs20.c
@@ -1212,6 +1212,14 @@ static char *msWCSGetFormatsList20( mapObj *map, layerObj *layer )
     tokens = msStringSplit(value, ' ', &numtokens);
   }
 
+  /* -------------------------------------------------------------------- */
+  /*      Parse from map.web metadata.                                    */
+  /* -------------------------------------------------------------------- */
+  else if((value = msOWSGetEncodeMetadata( &(map->web.metadata), "CO", "formats",
+                                           NULL)) != NULL ) {
+    tokens = msStringSplit(value, ' ', &numtokens);
+  }
+
   /* -------------------------------------------------------------------- */
   /*      Or generate from all configured raster output formats that      */
   /*      look plausible.                                                 */
@@ -2825,7 +2833,8 @@ static int msWCSDescribeCoverage20_CoverageDescription(mapObj *map,
     /* -------------------------------------------------------------------- */
     /*      SupportedFormats                                                */
     /* -------------------------------------------------------------------- */
-    {
+    /* for now, WCS 2.0 does not allow per coverage format definitions */
+    /*{
       xmlNodePtr psSupportedFormats;
       char *format_list;
 
@@ -2840,7 +2849,7 @@ static int msWCSDescribeCoverage20_CoverageDescription(mapObj *map,
       }
 
       msFree(format_list);
-    }
+    }*/
 
     /* -------------------------------------------------------------------- */
     /*      nativeFormat                                                    */