[mapserver-commits] r10238 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-06-22 19:08:43 +0000 (Tue, 22 Jun 2010)
New Revision: 10238

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapdraw.c
Log:
Fixed Drawing inline text not working (bitmap) (#3475)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-06-18 11:51:15 UTC (rev 10237)
+++ trunk/mapserver/HISTORY.TXT	2010-06-22 19:08:43 UTC (rev 10238)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed Drawing inline text not working (bitmap) (#3475)
+
 - ensure well formed XML when msWCSGetCapabilities_CoverageOfferingBrief
   returns MS_FAILURE (#3469)
 

Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c	2010-06-18 11:51:15 UTC (rev 10237)
+++ trunk/mapserver/mapdraw.c	2010-06-22 19:08:43 UTC (rev 10238)
@@ -2521,10 +2521,13 @@
             }
           }
           
-          size = labelPtr->size * layerPtr->scalefactor;
-          size = MS_MAX(size, labelPtr->minsize*image->resolutionfactor);
-          size = MS_MIN(size, labelPtr->maxsize*image->resolutionfactor);
-          scalefactor = size / labelPtr->size;
+          if(labelPtr->type == MS_TRUETYPE) {          
+              size = labelPtr->size * layerPtr->scalefactor;
+              size = MS_MAX(size, labelPtr->minsize*image->resolutionfactor);
+              size = MS_MIN(size, labelPtr->maxsize*image->resolutionfactor);
+              scalefactor = size / labelPtr->size;
+          } else
+              scalefactor = layerPtr->scalefactor;
 
           label_offset_x = labelPtr->offsetx*scalefactor;
           label_offset_y = labelPtr->offsety*scalefactor;