[mapserver-commits] r11314 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-23 10:45:26 -0700 (Wed, 23 Mar 2011)
New Revision: 11314

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maprendering.c
Log:
apply min/max size/width style values to polygon spacing (vaguely related to #3132)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-23 17:39:20 UTC (rev 11313)
+++ trunk/mapserver/HISTORY.TXT	2011-03-23 17:45:26 UTC (rev 11314)
@@ -14,6 +14,8 @@
 
 Current Version (SVN trunk):
 ----------------------------
+- apply min/max size/width style values to polygon spacing (vaguely related to #3132)
+
 - assure that a created tile has a non-zero width and height (#3370)
 
 - use png_sig_cmp instead of png_check_sig (#3762)

Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-03-23 17:39:20 UTC (rev 11313)
+++ trunk/mapserver/maprendering.c	2011-03-23 17:45:26 UTC (rev 11314)
@@ -540,7 +540,12 @@
                if(ret != MS_SUCCESS) goto cleanup;
             }
             width = (style->width <= 0)?scalefactor:style->width*scalefactor;
+            width = MS_MIN(width, style->maxwidth);
+            width = MS_MAX(width, style->minwidth);
             spacing = (style->size <= 0)?scalefactor:style->size*scalefactor;
+            spacing = (style->size <= 0)?scalefactor:style->size*scalefactor;
+            spacing = MS_MIN(spacing, style->size);
+            spacing = MS_MAX(spacing, style->size);
             ret = msHatchPolygon(image,offsetPolygon,spacing,width,style->angle, &style->color);
             goto cleanup;
          }