[mapserver-commits] r9462 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2009-10-15 05:20:56 -0400 (Thu, 15 Oct 2009)
New Revision: 9462

Modified:
   trunk/mapserver/maplabel.c
Log:
apply correct scalefactor for minsize/maxsize (#3157)


Modified: trunk/mapserver/maplabel.c
===================================================================
--- trunk/mapserver/maplabel.c	2009-10-14 23:36:46 UTC (rev 9461)
+++ trunk/mapserver/maplabel.c	2009-10-15 09:20:56 UTC (rev 9462)
@@ -1082,8 +1082,8 @@
   }
   else
       size = style->size;
-  if(size*scalefactor > style->maxsize*img->resolutionfactor) scalefactor = (float)style->maxsize/(float)size;
-  if(size*scalefactor < style->minsize*img->resolutionfactor) scalefactor = (float)style->minsize/(float)size;
+  if(size*scalefactor > style->maxsize*img->resolutionfactor) scalefactor = (float)style->maxsize*img->resolutionfactor/(float)size;
+  if(size*scalefactor < style->minsize*img->resolutionfactor) scalefactor = (float)style->minsize*img->resolutionfactor/(float)size;
   gap = MS_ABS(symbol->gap)* (int) scalefactor;
   label.size = size ;/* "* scalefactor" removed: this is already scaled in msDrawTextGD()*/
   /* label.minsize = style->minsize; */