[mapserver-commits] r7372 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2008-02-12 13:33:59 -0500 (Tue, 12 Feb 2008)
New Revision: 7372

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwcs.c
Log:
test for either resx/resy OR width/height (#2505)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-02-12 18:13:13 UTC (rev 7371)
+++ trunk/mapserver/HISTORY.TXT	2008-02-12 18:33:59 UTC (rev 7372)
@@ -13,6 +13,8 @@
 Current Version (5.1-dev, SVN trunk):
 -------------------------------------
 
+- mapwcs.c: test for either resx/resy OR width/height (#2505)
+
 - mapwcs.c: make GetCoverage demand one of TIME or BBOX (#2504)
 
 - mapwms.c: make GetLegendGraphic listen to TRANSPARENT in OUTPUTFORMAT (#2494)

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2008-02-12 18:13:13 UTC (rev 7371)
+++ trunk/mapserver/mapwcs.c	2008-02-12 18:33:59 UTC (rev 7372)
@@ -1546,7 +1546,7 @@
   }
 
   /* are we still underspecified?  */
-  if( params->width == 0 || params->height == 0 || params->resx == 0.0 || params->resy == 0.0 ) {
+  if( (params->width == 0 || params->height == 0) && (params->resx == 0.0 || params->resy == 0.0 )) {
     msSetError( MS_WCSERR, "A non-zero RESX/RESY or WIDTH/HEIGHT is required but neither was provided.", "msWCSGetCoverage()" );
     return msWCSException(map, "MissingParameterValue", "width/height/resx/resy", params->version);
   }