[mapserver-commits] r11309 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-23 08:03:25 -0700 (Wed, 23 Mar 2011)
New Revision: 11309

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maprendering.c
Log:
Rendering: scale style OFFSET and GAP the same way we scale other style attributes.
Beforehand, we scaled them proportionaly to the computeed width.


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-23 14:45:08 UTC (rev 11308)
+++ trunk/mapserver/HISTORY.TXT	2011-03-23 15:03:25 UTC (rev 11309)
@@ -15,6 +15,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Rendering: scale style OFFSET and GAP the same way we scale other style attributes.
+  Beforehand, we scaled them proportionaly to the computeed width.
+
 - KML: fix rounding problem for point feautres (#3767)
 
 - KML: update code to reflect output changes. Fix true type symbols. (#3766)

Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-03-23 14:45:08 UTC (rev 11308)
+++ trunk/mapserver/maprendering.c	2011-03-23 15:03:25 UTC (rev 11309)
@@ -385,10 +385,10 @@
          width = MS_MAX(width,style->minwidth);
 
          if(style->offsety==-99) {
-            offsetLine = msOffsetPolyline(p,style->offsetx * width,-99);
+            offsetLine = msOffsetPolyline(p,style->offsetx * width/style->width,-99);
          } else if(style->offsetx!=0 || style->offsety!=0) {
-            offsetLine = msOffsetPolyline(p,
-                                          style->offsetx * width, style->offsety * width);
+            offsetLine = msOffsetPolyline(p, style->offsetx * width/style->width,
+                  style->offsety * width/style->width);
          }
          if(style->symbol == 0 || (symbol->type==MS_SYMBOL_SIMPLE)) {
             strokeStyleObj s;
@@ -398,7 +398,7 @@
             s.width = width;
             s.patternlength = style->patternlength;
             for(i=0; i<s.patternlength; i++)
-               s.pattern[i] = style->pattern[i]*s.width;
+               s.pattern[i] = style->pattern[i]*s.width/style->width;
 
             if(MS_VALID_COLOR(style->color))
                s.color = &style->color;