[mapserver-commits] r9916 - in branches/branch-5-6/mapserver: . mapscript/swiginc

[svn at osgeo.org]

Author: aboudreault
Date: 2010-03-05 09:53:33 -0500 (Fri, 05 Mar 2010)
New Revision: 9916

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapscript/swiginc/mapzoom.i
Log:
Backport to 5.6: Fixed swig zoomRectangle() method: the maxy in the rect object have to be < miny value (#3286)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-05 14:47:03 UTC (rev 9915)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-05 14:53:33 UTC (rev 9916)
@@ -15,6 +15,8 @@
 Current Version (SVN branch-5-6):
 --------------------------------
 
+- Fixed swig zoomRectangle() method: the maxy in the rect object have to be < miny value (#3286)
+
 - Backport fix for SLD filters column names detection (#3052)
 
 - Backport fix for WFS OGC filters regex tests (#3289)

Modified: branches/branch-5-6/mapserver/mapscript/swiginc/mapzoom.i
===================================================================
--- branches/branch-5-6/mapserver/mapscript/swiginc/mapzoom.i	2010-03-05 14:47:03 UTC (rev 9915)
+++ branches/branch-5-6/mapserver/mapscript/swiginc/mapzoom.i	2010-03-05 14:53:33 UTC (rev 9916)
@@ -226,7 +226,9 @@
         /* ----------------------------------------------------------- */
         /*      check if the values passed are consistent min <= max.   */
         /* ----------------------------------------------------------- */
-        if (poPixRect->minx >= poPixRect->maxx) {
+        /* This is not a typo: "maxx >= minx". For historical reason, we
+         * keep this as it is. See documentation for more info about this check. */
+        if (poPixRect->maxx >= poPixRect->minx) {
             msSetError(MS_MISCERR, "image rectangle minx >= maxx", "mapscript::mapObj::zoomRectangle()");
             return MS_FAILURE;
         }