[mapserver-commits] r9815 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-02-20 13:36:27 -0500 (Sat, 20 Feb 2010)
New Revision: 9815

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maplabel.c
Log:
Enhance error messages in msGetTruetypeTextBBox() (#3314)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-02-20 18:33:13 UTC (rev 9814)
+++ trunk/mapserver/HISTORY.TXT	2010-02-20 18:36:27 UTC (rev 9815)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Enhance error messages in msGetTruetypeTextBBox() (#3314)
+
 - Report parsing errors in INCUDEd files using the line number within the file (#3329)
 
 - Avoid memory error when building SQL bbox (#3324)

Modified: trunk/mapserver/maplabel.c
===================================================================
--- trunk/mapserver/maplabel.c	2010-02-20 18:33:13 UTC (rev 9814)
+++ trunk/mapserver/maplabel.c	2010-02-20 18:36:27 UTC (rev 9815)
@@ -673,9 +673,9 @@
 	} else 
 #ifdef USE_AGG
 	if(img!=NULL && MS_RENDERER_AGG(img->format)) {
-        msGetTruetypeTextBBoxAGG(img,font,size,string,rect,advances);
+        	return msGetTruetypeTextBBoxAGG(img,font,size,string,rect,advances);
         //printf("%s: %f %f %f %f\n",string,rect->minx,rect->miny,rect->maxx,rect->maxy);
-        return MS_SUCCESS;
+        //return MS_SUCCESS;
     } else
 #endif
     {
@@ -718,7 +718,7 @@
         } else {
             error = gdImageStringFT(NULL, bbox, 0, font, size, 0, 0, 0, string);
             if(error) {
-                msSetError(MS_TTFERR, error, "msGetTruetypeTextBBox()");
+                msSetError(MS_TTFERR, "gdImageStringFT: %s (%s)", "msGetTruetypeTextBBox()", error, font);
                 return(MS_FAILURE);
             }