[mapserver-commits] r11417 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-31 02:13:01 -0700 (Thu, 31 Mar 2011)
New Revision: 11417

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maprendering.c
Log:
fix incorrect scaling of hatch symbol spacing (#3773)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-31 09:10:37 UTC (rev 11416)
+++ trunk/mapserver/HISTORY.TXT	2011-03-31 09:13:01 UTC (rev 11417)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- fix incorrect scaling of hatch symbol spacing (#3773)
+
 - fix incorrect background color for INIMAGE exceptions (#3790)
 
 Version 6.0.0-beta4 (2011-03-30)

Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-03-31 09:10:37 UTC (rev 11416)
+++ trunk/mapserver/maprendering.c	2011-03-31 09:13:01 UTC (rev 11417)
@@ -543,8 +543,8 @@
             width = MS_MIN(width, style->maxwidth);
             width = MS_MAX(width, style->minwidth);
             spacing = (style->size <= 0)?scalefactor:style->size*scalefactor;
-            spacing = MS_MIN(spacing, style->size);
-            spacing = MS_MAX(spacing, style->size);
+            spacing = MS_MIN(spacing, style->maxsize);
+            spacing = MS_MAX(spacing, style->minsize);
             ret = msHatchPolygon(image,offsetPolygon,spacing,width,style->angle, &style->color);
             goto cleanup;
          }