fix issues with imagemap introduced with gd removal

MapServer · Apr 8, 2012 · 68c5ffa · 68c5ffa
1 parent 1c4e225
commit 68c5ffa
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/mapdraw.c b/mapdraw.c
@@ -182,7 +182,6 @@ imageObj *msPrepareImage(mapObj *map, int allow_nonsquare)
     {
         image = msImageCreateIM(map->width, map->height, map->outputformat, 
 				map->web.imagepath, map->web.imageurl, map->resolution, map->defresolution);        
-        if( image != NULL ) msImageInitIM( image );
     }
     else if( MS_RENDERER_RAWDATA(map->outputformat) )
     {
@@ -3129,8 +3128,6 @@ int msDrawLabelCache(imageObj *image, mapObj *map)
 #endif
 
       return MS_SUCCESS; /* necessary? */
-    } else if( MS_RENDERER_IMAGEMAP(image->format) ) {
-      nReturnVal = msDrawLabelCacheIM(image, map);
     }
   }
 

diff --git a/mapserver.h b/mapserver.h
@@ -2269,6 +2269,7 @@ MS_DLL_EXPORT void msGDCleanup();
 #endif
 MS_DLL_EXPORT void msImageStartLayerIM(mapObj *map, layerObj *layer, imageObj *image);
 MS_DLL_EXPORT int msSaveImageIM(imageObj* img, char *filename, outputFormatObj *format);
+MS_DLL_EXPORT void msFreeImageIM(imageObj* img);
 MS_DLL_EXPORT void msDrawMarkerSymbolIM(symbolSetObj *symbolset, imageObj* img, pointObj *p, styleObj *style, double scalefactor);
 MS_DLL_EXPORT void msDrawLineSymbolIM(symbolSetObj *symbolset, imageObj* img, shapeObj *p, styleObj *style, double scalefactor);
 MS_DLL_EXPORT void msDrawShadeSymbolIM(symbolSetObj *symbolset, imageObj* img, shapeObj *p, styleObj *style, double scalefactor);

diff --git a/maputil.c b/maputil.c
@@ -1636,7 +1636,6 @@ imageObj *msImageCreate(int width, int height, outputFormatObj *format,
     {
         image = msImageCreateIM(width, height, format,
                                 imagepath, imageurl, resolution, defresolution);
-        if( image != NULL ) msImageInitIM( image );
     }
     else 
     {