Permalink
Browse files

Fix most remaining warnings raised on Travis

  • Loading branch information...
rouault committed Aug 4, 2015
1 parent 1a3dbea commit 0fc850b71423323fbc163531395bb34509df6744
Showing with 465 additions and 383 deletions.
  1. +1 −1 kerneldensity.c
  2. +3 −2 mapcairo.c
  3. +4 −1 mapkmlrenderer.cpp
  4. +356 −355 maplexer.c
  5. +1 −0 maplexer.l
  6. +5 −1 mapogcfilter.c
  7. +5 −1 mapogcsld.c
  8. +2 −0 mapprimitive.c
  9. +1 −1 maprendering.c
  10. +9 −2 maptemplate.c
  11. +52 −11 maptree.c
  12. +1 −1 maputil.c
  13. +23 −5 mapxbase.c
  14. +2 −2 textlayout.c
@@ -84,7 +84,7 @@ int msComputeKernelDensityDataset(mapObj *map, imageObj *image, layerObj *kernel
int status,layer_idx, i,j, nclasses=0, have_sample=0;
rectObj searchrect;
shapeObj shape;
layerObj *layer;
layerObj *layer = NULL;
float *values = NULL;
int radius = 10, im_width = image->width, im_height = image->height;
int expand_searchrect=1;
@@ -1016,6 +1016,7 @@ int msRenderRasterizedSVGSymbol(imageObj *img, double x, double y, symbolObj *sy
struct svg_symbol_cache *svg_cache;
symbolStyleObj pixstyle;
symbolObj pixsymbol;
int status;
if(MS_SUCCESS != msPreloadSVGSymbol(symbol))
return MS_FAILURE;
@@ -1084,9 +1085,9 @@ int msRenderRasterizedSVGSymbol(imageObj *img, double x, double y, symbolObj *sy
pixsymbol.pixmap_buffer = svg_cache->pixmap_buffer;
pixsymbol.type = MS_SYMBOL_PIXMAP;
MS_IMAGE_RENDERER(img)->renderPixmapSymbol(img,x,y,&pixsymbol,&pixstyle);
status = MS_IMAGE_RENDERER(img)->renderPixmapSymbol(img,x,y,&pixsymbol,&pixstyle);
MS_IMAGE_RENDERER(img)->freeSymbol(&pixsymbol);
return MS_SUCCESS;
return status;
#else
msSetError(MS_MISCERR, "SVG Symbols requested but MapServer is not built with libsvgcairo",
"renderSVGSymbolCairo()");
@@ -754,6 +754,7 @@ imageObj *agg2CreateImage(int width, int height, outputFormatObj *format, colorO
int KmlRenderer::createIconImage(char *fileName, symbolObj *symbol, symbolStyleObj *symstyle)
{
pointObj p;
int status;
imageObj *tmpImg = NULL;
@@ -770,7 +771,9 @@ int KmlRenderer::createIconImage(char *fileName, symbolObj *symbol, symbolStyleO
p.z = 0.0;
#endif
msDrawMarkerSymbol(map,tmpImg, &p, symstyle->style, 1);
status = msDrawMarkerSymbol(map,tmpImg, &p, symstyle->style, 1);
if( status != MS_SUCCESS )
return status;
return msSaveImage(map, tmpImg, fileName);
}
Oops, something went wrong.

0 comments on commit 0fc850b

Please sign in to comment.