[mapserver-commits] r9870 - trunk/mapserver
svn at osgeo.org
svn at osgeo.org
Mon Feb 22 17:51:00 EST 2010
Author: sdlime
Date: 2010-02-22 17:51:00 -0500 (Mon, 22 Feb 2010)
New Revision: 9870
Modified:
trunk/mapserver/mapdraw.c
trunk/mapserver/mapfile.c
Log:
Removed leftover debug messages...
Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c 2010-02-22 22:21:34 UTC (rev 9869)
+++ trunk/mapserver/mapdraw.c 2010-02-22 22:51:00 UTC (rev 9870)
@@ -2588,14 +2588,11 @@
continue; /* next label */
/* here's where we draw the label styles */
- fprintf(stderr, "%d\n", cachePtr->label.numstyles);
if(cachePtr->label.numstyles > 0) {
for(i=0; i<cachePtr->label.numstyles; i++) {
- fprintf(stderr, "gt=%d\n", cachePtr->label.styles[i]->_geomtransform);
if(cachePtr->label.styles[i]->_geomtransform == MS_GEOMTRANSFORM_LABELPOINT)
msDrawMarkerSymbol(&map->symbolset, image, &(cachePtr->point), cachePtr->label.styles[i], layerPtr->scalefactor);
else if(cachePtr->label.styles[i]->_geomtransform == MS_GEOMTRANSFORM_LABELPOLY) {
- fprintf(stderr, "HERE!\n");
msDrawShadeSymbol(&map->symbolset, image, &billboard, cachePtr->label.styles[i], layerPtr->scalefactor);
} else {
/* need error msg about unsupported geomtransform */
@@ -2632,7 +2629,6 @@
msDrawText(image, p, cachePtr->text, labelPtr, &(map->fontset), layerPtr->scalefactor); /* actually draw the label */
}
- fprintf(stderr, "Finished %s, next label...\n", cachePtr->text);
} /* next label */
} /* next priority */
Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c 2010-02-22 22:21:34 UTC (rev 9869)
+++ trunk/mapserver/mapfile.c 2010-02-22 22:51:00 UTC (rev 9870)
@@ -1367,7 +1367,6 @@
msFree(label->font);
msFree(label->encoding);
- fprintf(stderr, "in freeLabel %d\n", label->numstyles);
for(i=0;i<label->numstyles;i++) { /* each style */
if(label->styles[i]!=NULL) {
if(freeStyle(label->styles[i]) == MS_SUCCESS) {
@@ -2224,8 +2223,6 @@
int freeStyle(styleObj *style) {
int i;
- fprintf(stderr, "%g\n", style->size);
-
if( MS_REFCNT_DECR_IS_NOT_ZERO(style) ) { return MS_FAILURE; }
msFree(style->symbolname);
@@ -2367,7 +2364,6 @@
if (&(class->metadata)) msFreeHashItems(&(class->metadata));
if (&(class->validation)) msFreeHashItems(&(class->validation));
- fprintf(stderr, "in freeClass %d\n", class->numstyles);
for(i=0;i<class->numstyles;i++) { /* each style */
if(class->styles[i]!=NULL) {
if(freeStyle(class->styles[i]) == MS_SUCCESS) {
More information about the mapserver-commits
mailing list