[mapserver-commits] r7585 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2008-05-13 01:19:24 -0400 (Tue, 13 May 2008)
New Revision: 7585

Modified:
   trunk/mapserver/mappdf.c
Log:
update for new msGetLabelSize function signature (#2357)

Modified: trunk/mapserver/mappdf.c
===================================================================
--- trunk/mapserver/mappdf.c	2008-05-12 22:28:17 UTC (rev 7584)
+++ trunk/mapserver/mappdf.c	2008-05-13 05:19:24 UTC (rev 7585)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id:$
+ * $Id$
  *
  * Project:  MapServer
  * Purpose:  An api for PDF format output using the pdflib library
@@ -451,7 +451,7 @@
         pointObj p;
         rectObj r;
 
-        if(msGetLabelSize(string, label, &r, fontset, scalefactor, MS_FALSE) == -1) return(-1);
+        if(msGetLabelSize(image,string, label, &r, fontset, scalefactor, MS_FALSE) == -1) return(-1);
         p = get_metrics(&labelPnt, label->position, r,
                                    label->offsetx,
                                    label->offsety,
@@ -534,7 +534,7 @@
         if(strlen(cachePtr->text) == 0)
             continue; /* not an error, just don't want to do anything */
 
-        if(msGetLabelSize(cachePtr->text, labelPtr, &r, &(map->fontset), layerPtr->scalefactor, MS_TRUE) == -1)
+        if(msGetLabelSize(image,cachePtr->text, labelPtr, &r, &(map->fontset), layerPtr->scalefactor, MS_TRUE) == -1)
             return(-1);
 
         if(labelPtr->autominfeaturesize && ((r.maxx-r.minx) > cachePtr->featuresize))