[mapserver-commits] r7128 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2007-11-30 12:49:36 -0500 (Fri, 30 Nov 2007)
New Revision: 7128

Modified:
   trunk/mapserver/mapwcs11.c
Log:
fix imageCRS box, and multipart mime format

Modified: trunk/mapserver/mapwcs11.c
===================================================================
--- trunk/mapserver/mapwcs11.c	2007-11-30 17:47:50 UTC (rev 7127)
+++ trunk/mapserver/mapwcs11.c	2007-11-30 17:49:36 UTC (rev 7128)
@@ -231,7 +231,7 @@
     xmlAddChild( 
         psCSummary,
         msOWSCommonBoundingBox( psOwsNs, "urn:ogc:def:crs:OGC::imageCRS",
-                                2, 0, 0, cm.xsize, cm.ysize ));
+                                2, 0, 0, cm.xsize-1, cm.ysize-1 ));
 
 /* -------------------------------------------------------------------- */
 /*      native CRS bounding box.                                        */
@@ -551,7 +551,7 @@
     xmlAddChild( 
         psSD,
         msOWSCommonBoundingBox( psOwsNs, "urn:ogc:def:crs:OGC::imageCRS",
-                                2, 0, 0, cm.xsize, cm.ysize ));
+                                2, 0, 0, cm.xsize-1, cm.ysize-1 ));
 
 /* -------------------------------------------------------------------- */
 /*      native CRS bounding box.                                        */
@@ -585,7 +585,8 @@
                      "urn:ogc:def:method:WCS:1.1:2dSimpleGrid" );
 
         sprintf( format_buf, "%.15g %.15g", 
-                 cm.geotransform[0], cm.geotransform[3] );
+                 cm.geotransform[0]+cm.geotransform[1]/2+cm.geotransform[2]/2, 
+                 cm.geotransform[3]+cm.geotransform[4]/2+cm.geotransform[5]/2);
         xmlNewChild( psGridCRS, NULL, "GridOrigin", format_buf );
 
         sprintf( format_buf, "%.15g %.15g", 
@@ -871,7 +872,6 @@
         10, 10 );
 
       status = msSaveImage(map, image, NULL);
-      
       if( status != MS_SUCCESS )
       {
           return msWCSException(map, params->version, NULL, NULL);