[mapserver-commits] r12707 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-10-27 01:35:36 -0700 (Thu, 27 Oct 2011)
New Revision: 12707

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maprendering.c
Log:
fix grid of thin lines in polygon symbol fills (#3868)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-10-26 17:04:27 UTC (rev 12706)
+++ trunk/mapserver/HISTORY.TXT	2011-10-27 08:35:36 UTC (rev 12707)
@@ -14,6 +14,7 @@
 
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 -------------------------------------------------
+- Fixed grid of thin lines in polygon symbol fills (#3868)
 
 - Fixed cannot add a style to a label in PHP/SWIG Mapscript (#4038)
 

Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-10-26 17:04:27 UTC (rev 12706)
+++ trunk/mapserver/maprendering.c	2011-10-27 08:35:36 UTC (rev 12707)
@@ -490,8 +490,8 @@
                   int pw,ph;
                   imageObj* tile=NULL;
                   if(s.scale != 1) {
-                     pw = MS_NINT(symbol->sizex * s.scale)+1;
-                     ph = MS_NINT(symbol->sizey * s.scale)+1;
+                     pw = MS_NINT(symbol->sizex * s.scale);
+                     ph = MS_NINT(symbol->sizey * s.scale);
                   } else {
                      pw = symbol->sizex;
                      ph = symbol->sizey;
@@ -660,8 +660,8 @@
             }
 
             if(s.scale != 1) {
-               pw = MS_NINT(symbol->sizex * s.scale + s.gap)+1;
-               ph = MS_NINT(symbol->sizey * s.scale + s.gap)+1;
+               pw = MS_NINT(symbol->sizex * s.scale + s.gap);
+               ph = MS_NINT(symbol->sizey * s.scale + s.gap);
             } else {
                pw = symbol->sizex + s.gap;
                ph = symbol->sizey + s.gap;