[mapserver-commits] r12975 - in trunk/mapserver/mapcache: apache lib util

[svn at osgeo.org]

Author: tbonfort
Date: 2012-01-05 05:35:37 -0800 (Thu, 05 Jan 2012)
New Revision: 12975

Modified:
   trunk/mapserver/mapcache/apache/mod_mapcache.c
   trunk/mapserver/mapcache/lib/dimension.c
   trunk/mapserver/mapcache/lib/image.c
   trunk/mapserver/mapcache/lib/service_wms.c
   trunk/mapserver/mapcache/util/mapcache_seed.c
Log:
fix compilation warnings


Modified: trunk/mapserver/mapcache/apache/mod_mapcache.c
===================================================================
--- trunk/mapserver/mapcache/apache/mod_mapcache.c	2012-01-05 13:20:56 UTC (rev 12974)
+++ trunk/mapserver/mapcache/apache/mod_mapcache.c	2012-01-05 13:35:37 UTC (rev 12975)
@@ -301,8 +301,8 @@
    }
    return write_http_response(apache_ctx,http_response);
 }
+
 static int mod_mapcache_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) {
-   apr_status_t rc;
    mapcache_server_cfg* cfg = ap_get_module_config(s->module_config, &mapcache_module);
    server_rec *sconf;
 

Modified: trunk/mapserver/mapcache/lib/dimension.c
===================================================================
--- trunk/mapserver/mapcache/lib/dimension.c	2012-01-05 13:20:56 UTC (rev 12974)
+++ trunk/mapserver/mapcache/lib/dimension.c	2012-01-05 13:35:37 UTC (rev 12975)
@@ -145,8 +145,7 @@
 
 static void _mapcache_dimension_regex_parse_xml(mapcache_context *ctx, mapcache_dimension *dim,
       ezxml_t node) {
-  mapcache_dimension_regex *dimension;
-  int rc;
+   mapcache_dimension_regex *dimension;
    const char *entry = node->txt;
    if(!entry || !*entry) {
       ctx->set_error(ctx,400,"failed to parse dimension regex: none supplied");

Modified: trunk/mapserver/mapcache/lib/image.c
===================================================================
--- trunk/mapserver/mapcache/lib/image.c	2012-01-05 13:20:56 UTC (rev 12974)
+++ trunk/mapserver/mapcache/lib/image.c	2012-01-05 13:35:37 UTC (rev 12975)
@@ -58,8 +58,10 @@
 
 void mapcache_image_merge(mapcache_context *ctx, mapcache_image *base, mapcache_image *overlay) {
    int starti,startj;
+#ifndef USE_PIXMAN
    int i,j;
    unsigned char *browptr, *orowptr, *bptr, *optr;
+#endif
 
    if(base->w < overlay->w || base->h < overlay->h) {
       ctx->set_error(ctx, 500, "attempting to merge an larger image onto another");

Modified: trunk/mapserver/mapcache/lib/service_wms.c
===================================================================
--- trunk/mapserver/mapcache/lib/service_wms.c	2012-01-05 13:20:56 UTC (rev 12974)
+++ trunk/mapserver/mapcache/lib/service_wms.c	2012-01-05 13:35:37 UTC (rev 12975)
@@ -501,7 +501,7 @@
          }
          if(config->mode != MAPCACHE_MODE_NORMAL) {
             main_tileset = mapcache_tileset_clone(ctx,main_tileset);
-            main_tileset->name = key;
+            main_tileset->name = (char*)key;
          }
 
          for(i=0;i<main_tileset->grid_links->nelts;i++){
@@ -578,7 +578,7 @@
                }
                if(config->mode != MAPCACHE_MODE_NORMAL) {
                   tileset = mapcache_tileset_clone(ctx,tileset);
-                  tileset->name = key;
+                  tileset->name = (char*)key;
                }
                grid_link = NULL;
                for(i=0;i<tileset->grid_links->nelts;i++){

Modified: trunk/mapserver/mapcache/util/mapcache_seed.c
===================================================================
--- trunk/mapserver/mapcache/util/mapcache_seed.c	2012-01-05 13:20:56 UTC (rev 12974)
+++ trunk/mapserver/mapcache/util/mapcache_seed.c	2012-01-05 13:35:37 UTC (rev 12975)
@@ -334,7 +334,6 @@
 
 void cmd_recurse(mapcache_context *cmd_ctx, mapcache_tile *tile) {
   cmd action;
-  int i,j;
   int curx, cury, curz;
   int minchildx,maxchildx,minchildy,maxchildy;
   double bboxbl[4],bboxtr[4];