[mapserver-commits] r9451 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2009-10-13 12:30:10 -0400 (Tue, 13 Oct 2009)
New Revision: 9451

Modified:
   trunk/mapserver/mapgd.c
Log:
Revert scaling of a few properties in gd driver (#3157)

Modified: trunk/mapserver/mapgd.c
===================================================================
--- trunk/mapserver/mapgd.c	2009-10-13 15:46:14 UTC (rev 9450)
+++ trunk/mapserver/mapgd.c	2009-10-13 16:30:10 UTC (rev 9451)
@@ -1941,7 +1941,7 @@
     /* and scale the pattern */
     int n=0;
     for(i=0; i<symbol->patternlength; i++) {
-      symbol_pattern[i] = symbol->pattern[i]*scalefactor;
+      symbol_pattern[i] = symbol->pattern[i];
       n += symbol_pattern[i];
     }
     style = (int *) malloc (n * sizeof(int));
@@ -2873,8 +2873,8 @@
   if(label->outlinecolor.pen == MS_PEN_UNSET) msImageSetPenGD(img, &(label->outlinecolor));
   if(label->shadowcolor.pen == MS_PEN_UNSET) msImageSetPenGD(img, &(label->shadowcolor));
 
-  shadowsizex = label->shadowsizex*scalefactor;
-  shadowsizey = label->shadowsizey*scalefactor;
+  shadowsizex = label->shadowsizex;
+  shadowsizey = label->shadowsizey;
 
   if(label->type == MS_TRUETYPE) {
     char *error=NULL, *font=NULL;
@@ -3007,8 +3007,8 @@
     size = label->size*scalefactor;
     size = MS_MAX(size, label->minsize);
     size = MS_MIN(size, label->maxsize);
-    shadowsizex = label->shadowsizex*scalefactor;
-    shadowsizey = label->shadowsizey*scalefactor;
+    shadowsizex = label->shadowsizex;
+    shadowsizey = label->shadowsizey;
 
 #ifdef USE_GD_FT
     if(!fontset) {