Permalink
Browse files

Fix some warnings

  • Loading branch information...
1 parent b4a826d commit 7cfa846aed22af7ed7556a375761727883475433 Alan Boudreault committed Aug 7, 2013
Showing with 4 additions and 3 deletions.
  1. +1 −0 mapserver.h
  2. +3 −3 mapuvraster.c
View
@@ -2093,6 +2093,7 @@ extern "C" {
MS_DLL_EXPORT int msLoadSymbolSet(symbolSetObj *symbolset, mapObj *map);
MS_DLL_EXPORT int msCopySymbol(symbolObj *dst, symbolObj *src, mapObj *map);
MS_DLL_EXPORT int msCopySymbolSet(symbolSetObj *dst, symbolSetObj *src, mapObj *map);
+ MS_DLL_EXPORT int msCopyHashTable(hashTableObj *dst, hashTableObj *src);
MS_DLL_EXPORT void msInitSymbolSet(symbolSetObj *symbolset);
MS_DLL_EXPORT symbolObj *msGrowSymbolSet( symbolSetObj *symbolset );
MS_DLL_EXPORT int msAddImageSymbol(symbolSetObj *symbolset, char *filename);
View
@@ -404,7 +404,7 @@ int msUVRASTERLayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
outputformat->imagemode = MS_IMAGEMODE_FLOAT32;
msAppendOutputFormat(map_tmp, outputformat);
- msCopyHashTable(map_tmp->configoptions, layer->map->configoptions);
+ msCopyHashTable(&map_tmp->configoptions, &layer->map->configoptions);
map_tmp->mappath = msStrdup(layer->map->mappath);
map_tmp->shapepath = msStrdup(layer->map->shapepath);
map_tmp->extent.minx = rect.minx-(0.5*map_cellsize)+(0.5*map_tmp->cellsize);
@@ -416,7 +416,7 @@ int msUVRASTERLayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
msCopyProjection(&map_tmp->projection, &layer->projection);
if (layer->debug == 5)
- msDebug("msUVRASTERLayerWhichShapes(): extent: %g %d %g %g\n",
+ msDebug("msUVRASTERLayerWhichShapes(): extent: %g %g %g %g\n",
map_tmp->extent.minx, map_tmp->extent.miny,
map_tmp->extent.maxx, map_tmp->extent.maxy);
@@ -447,7 +447,7 @@ int msUVRASTERLayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
}
if (msDrawRasterLayerLow(map_tmp, layer, image_tmp, NULL ) == MS_FAILURE) {
- msSetError(MS_MISCERR, "Unable to draw raster data.", NULL, "msUVRASTERLayerWhichShapes()" );
+ msSetError(MS_MISCERR, "Unable to draw raster data.", "msUVRASTERLayerWhichShapes()");
return MS_FAILURE;
}

0 comments on commit 7cfa846

Please sign in to comment.