[mapserver-commits] r12391 - trunk/mapserver/mapcache/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:21:48 -0700 (Fri, 26 Aug 2011)
New Revision: 12391

Modified:
   trunk/mapserver/mapcache/src/cache_disk.c
Log:
add configurable resample mode when merging tiles.

closes issue 88.
thomas.bonfort | 2011-07-02 15:20:29 +0200 (Sat, 02 Jul 2011)

Modified: trunk/mapserver/mapcache/src/cache_disk.c
===================================================================
--- trunk/mapserver/mapcache/src/cache_disk.c	2011-08-26 11:21:44 UTC (rev 12390)
+++ trunk/mapserver/mapcache/src/cache_disk.c	2011-08-26 11:21:48 UTC (rev 12391)
@@ -238,7 +238,7 @@
       ret = apr_file_remove(filename,ctx->pool);
       if(ret != APR_SUCCESS) {
          ctx->set_error(ctx, 500,  "failed to remove existing file %s: %s",filename, apr_strerror(ret,errmsg,120));
-         return; /* we could not create the file */
+         return; /* we could not delete the file */
       }
    }
 
@@ -262,9 +262,10 @@
             if(APR_SUCCESS != (ret = apr_dir_make_recursive(
                   blankdirname,
                   APR_OS_DEFAULT,ctx->pool))) {
-               ctx->set_error(ctx, 500,  "failed to create directory %s for blank tiles",blankdirname, apr_strerror(ret,errmsg,120));
-               ctx->global_lock_release(ctx);
-               return;
+                  if(!APR_STATUS_IS_EEXIST(ret)) {
+                     ctx->set_error(ctx, 500,  "failed to create directory %s for blank tiles",blankdirname, apr_strerror(ret,errmsg,120));
+                     return;
+                  }
             }
             if((ret = apr_file_open(&f, blankname,
                   APR_FOPEN_CREATE|APR_FOPEN_WRITE|APR_FOPEN_BUFFERED|APR_FOPEN_BINARY,