Merge branch 'branch-1-2'

Conflicts:
	CMakeLists.txt

Author: tbonfort

CMakeLists.txt

@@ -66,11 +66,15 @@ set(CMAKE_LINK_INTERFACE_LIBRARY "")
 file(GLOB mapcache_SOURCES lib/*.c )
 
 add_library(mapcache SHARED ${mapcache_SOURCES})
+set_target_properties(mapcache PROPERTIES
+  VERSION ${MAPCACHE_VERSION_STRING}
+  SOVERSION 1
+)
 
 #options suported by the cmake builder
 option(WITH_PIXMAN "Use pixman for SSE optimized image manipulations" ON)
 option(WITH_SQLITE "Use sqlite as a cache backend" ON)
-option(WITH_BERKELEY_DB "Use sqlite as a cache backend" OFF)
+option(WITH_BERKELEY_DB "Use Berkeley DB as a cache backend" OFF)
 option(WITH_MEMCACHE "Use memcache as a cache backend (requires recent apr-util)" OFF)
 option(WITH_TIFF "Use TIFFs as a cache backend" OFF)
 option(WITH_TIFF_WRITE_SUPPORT "Enable (experimental) support for writable TIFF cache backends" OFF)

INSTALL

@@ -8,212 +8,8 @@ cd mapcache
 mkdir build
 cd build
 cmake ..
-# follow instructions below if missing a dependency
 make
 sudo make install
 
-The installation script takes care of putting the built module in the apache module directory.
-The process for activating a module is usually distro specific, but can be resumed by the 
-following snippet that should be present in the apache configuration file(s):
-
-LoadModule mapcache_module    modules/mod_mapcache.so
-
-Next, a mapcache configuration is mapped to the server url with the following snippet
-
-<IfModule mapcache_module>
-    <Directory /path/to/directory>
-       Order Allow,Deny
-       Allow from all
-    </Directory>
-    MapCacheAlias /mapcache "/path/to/directory/mapcache.xml"
-</IfModule>
-
-Before you restart, copy the example mapcache.xml file to where you want it:
-
-cp mapcache.xml /path/to/directory/mapcache.xml
-
-(as root)
-# apachectl restart
-
-If you have not disabled the demo service, you should now have access to it on
-http://myserver/mapcache/demo
-
-
-Customizing the build, or if something went wrong
--------------------------------------------------
-
-mod_mapcache requires apache, libcurl, libjpeg and libpng development headers.
-The cmake script will try to locate them in default system locations, that can be
-overriden or specified with -D switches. For example, if you don't want fcgi and
-you get a message such as 'Could NOT find APR ', you can use a command such as: 
-(assuming that apr is at /usr/local/apr)
-
-cmake -DWITH_FCGI=0 -DCMAKE_PREFIX_PATH="/usr/local/apr;" ..
-
-
-
-apache apxs
-===========
-
---with-apxs=/path/to/apxs
-
-apxs is the apache extension tool that is used for building and installing the module to a local
-apache instance. it should be installed along with a standard apache build, or supplied by
-distros when installing the apache development packages.
-apxs is sometimes called apxs2 (notably on debian). 
-On Ubuntu, apt-get install apache2-prefork-dev might help
-
-apr
-===
-
---with-apr-config=/path/to/apr-config
-
-apr-config is sometimes called apr-1-config on some systems. The path to the apr libraries is susually determined
-from the previous apxs utility. you can use this switch to override which apr will be used. beware that using a different
-version of apr than the one that is linked to by apache will likely cause bugs.
-
-apr-util
-========
-
---with-apu-config=/path/to/apu-config
-
-apu-config is sometimes called apu-1-config. the apr-util library is used to enable the memcached cache backend for
-stroing tiles. If you don't plan on using it you can safely ignore or disable it.
-
-libcurl
-=======
-
---with-curl-config=/path/to/curl-config
-
-libpng
-======
-
---with-png=/path/to/png/prefix
-
-this is the path where the libpng headers and libs can be located.
-the configure script will be looking for [path]/include/png.h and [path]/lib/libpng.so
-
-libjpeg
-======
-
---with-jpeg=/path/to/jpeg/prefix
-
-this is the path where the libjpeg headers and libs can be located.
-the configure script will be looking for [path]/include/jpeg.h and [path]/lib/libjpeg.so
-
-pixman (from 0.5 onwards) (recommended)
-=======================================
-
---with-pixman=[yes|no|/path/to/pkgconfig/pixman.pc]
-
-pixman is a pixel manipulation library used to assemble image tiles when responding
-to non-tiled wms requests. Pixman support is recommended as it is highly optimized
-and will take advantage of recent processor extensions (mms, sse, ...) to speed up
-blending and resampling operations. In case the pixman library is not found, mod-mapcache
-will fall back to internal pixel operations that are slower.
-
-sqlite (from 0.5 onwards) (optional)
-====================================
-
---with-sqlite[=/path/to/sqlite/prefix]
-
-sqlite is used to enable the sqlite and mbtiles cache backend. version 3.5.0 or newer is
-required.
-
-
-gdal (from 0.4 onwards) (optional)
-===================================
-
---with-gdal=/path/to/gdal-config
-
-gdal (actually ogr) is used by the seeding utility to allow the seeding of tiles only intersecting a given polygon, e.g.
-to preseed all the tiles of a given country.
-
-geos (from 0.5 onwards) (optional)
-===================================
-
---with-geos=/path/to/geos-config
-
-along with gdal/ogr, geos is needed by the seeder to test for the intersection of tiles with geographical features.
-
-pcre (optional)
-===============
-
---with-pcre=/path/to/pcre/prefix
-
-pcre (perl compatible regular expressions) can be used instead of posix regular expressions for validating WMS dimensions.
-they are more powerfull than posix REs (and might be slower). you don't need this if you aren't planning on using WMS
-dimension support with regex validation, or if your validation needs are covered by posix REs.
-
-fastcgi support (optional)
-==========================
-
-mod-mapcache can run as a fastcgi executable. Note that the overhead of fastcgi is non-negligeable with respect to 
-the throughput you may obtain with a native apache module. Note that the fastcgi build is less tested, and may lag behind
-compared to the apache module version on some minor details (most notably on error reporting, and cache-control header
-generation).
-
---with-fastcgi=/path/to/fastcgi/prefix
-
-give the location of the fastcgi libraries and headers.
-
-Experimental options, use at your own risk
-------------------------------------------
-
-debug
-=====
-
---enable-debug
-
-enables some extra tests inside the code, and prints out many more debugging messages to the server logs. you should
-probably not enable this unless you want to track down a problem happening inside mod-mapcache.
-
-file locking
-============
-
---with-lock-mechanism=file|semaphore
-
-mod-mapcache needs to keep a cross-process and cross-thread lock on tiles so that requests for tiles of a same metatile
-don't end up becoming multiple requests for the same metatile on the wms server. The default mechanism "file" is highly
-recommended unless you know what you are doing.
-
-This can be configured in two different ways in mod-mapcache, each with their advantage and inconvenience:
-
- * file : mod-mapcache will use a file to signal other rendering threads that the given metatile is being rendered by the
-   wms source. (the location of these files is configurable with the <lock_dir> configuration directive). In the case of 
-   threaded mpm, this has the inconvenience that we cannot be signaled by the operating system that this file has been
-   deleted, and thus must resort to sleeping every .5 sec and checking if the file still exists until the file is deleted.
-   This isn't very efficient, but should not be problematic in practice as this loop only happens if the tile wasn't
-   already in the cache, i.e. at most once per tile for the whole lifetime of the cache.
-
- * semaphore : mod-mapcache can use posix semaphores for waiting on tile rendering. This method has the inconvenience
-   that if a rendering thread crashes (or more likely is killed by the system administrator while waiting for the wms
-   source to finish rendering), the semaphore lives on in the operating system and will prevent all accesses to the
-   tile until the sempahore is manually deleted. As apache threads are locked while waiting for this semaphore that
-   will never be released, you might end up with loads of idle processes stacking up. (stuck semaphores on linux can
-   be discarded by deleteing the files of the form sem.x-x-x-gridname-tilesetname(...)  that are located in /dev/shm/.
-   The "file" maechanism does not have this limitation, as stale lockfiles can be deleted upon server restart.
-
-
-enabling mod_mapcache on Ubuntu
-===============================
-
-Ubuntu has it's own method of invoking modules, using a 'load' file.
-The conf files should be created in /etc/apache2/mods-available/, ie 
-
-echo 'LoadModule mapcache_module /usr/lib/apache2/modules/mod_mapcache.so' > /etc/apache2/mods-available/mapcache.load
-
-and then enable it: a2enmod mapcache
-
-However, before you restart apache, you will need to make the lib (which is in 
-/usr/local/lib) available, maybe by:
-
-ln -s /usr/local/lib/libmapcache.so /usr/lib/libmapcache.so
-
-
-
-
-
-Win32 compilation instructions
-------------------------------
-TODO
+Detailed instructions and configuration options are maintained in the mapcache documentation : 
+http://mapserver.org/mapcache/install.html

include/mapcache.h

@@ -889,7 +889,7 @@ mapcache_image* mapcache_image_create_with_data(mapcache_context *ctx, int width
 void mapcache_image_copy_resampled_nearest(mapcache_context *ctx, mapcache_image *src, mapcache_image *dst,
     double off_x, double off_y, double scale_x, double scale_y);
 void mapcache_image_copy_resampled_bilinear(mapcache_context *ctx, mapcache_image *src, mapcache_image *dst,
-    double off_x, double off_y, double scale_x, double scale_y);
+    double off_x, double off_y, double scale_x, double scale_y, int reflect_edges);
 
 
 /**

lib/cache_sqlite.c

@@ -749,6 +749,7 @@ static void _mapcache_cache_mbtiles_multi_set(mapcache_context *ctx, mapcache_ti
     }
   }
   conn = _sqlite_get_conn(ctx, &tiles[0], 0);
+  GC_CHECK_ERROR(ctx);
 
   sqlite3_exec(conn->handle, "BEGIN TRANSACTION", 0, 0, 0);
   for (i = 0; i < ntiles; i++) {

lib/image.c

@@ -233,7 +233,7 @@ void mapcache_image_copy_resampled_nearest(mapcache_context *ctx, mapcache_image
 }
 
 void mapcache_image_copy_resampled_bilinear(mapcache_context *ctx, mapcache_image *src, mapcache_image *dst,
-    double off_x, double off_y, double scale_x, double scale_y)
+    double off_x, double off_y, double scale_x, double scale_y, int reflect_edges)
 {
 #ifdef USE_PIXMAN
   pixman_image_t *si = pixman_image_create_bits(PIXMAN_a8r8g8b8,src->w,src->h,
@@ -244,7 +244,9 @@ void mapcache_image_copy_resampled_bilinear(mapcache_context *ctx, mapcache_imag
   pixman_transform_init_translate(&transform,pixman_double_to_fixed(-off_x),pixman_double_to_fixed(-off_y));
   pixman_transform_scale(&transform,NULL,pixman_double_to_fixed(1.0/scale_x),pixman_double_to_fixed(1.0/scale_y));
   pixman_image_set_transform (si, &transform);
-  pixman_image_set_repeat (si, PIXMAN_REPEAT_REFLECT);
+  if(reflect_edges) {
+    pixman_image_set_repeat (si, PIXMAN_REPEAT_REFLECT);
+  }
   pixman_image_set_filter(si,PIXMAN_FILTER_BILINEAR, NULL, 0);
   pixman_image_composite (PIXMAN_OP_OVER, si, NULL, bi,
                           0, 0, 0, 0, 0, 0, dst->w,dst->h);

lib/tileset.c

@@ -194,10 +194,10 @@ void mapcache_tileset_get_map_tiles(mapcache_context *ctx, mapcache_tileset *til
 
   mapcache_grid_get_xy(ctx,grid_link->grid,bbox->minx,bbox->miny,level,&bl_x,&bl_y);
   mapcache_grid_get_xy(ctx,grid_link->grid,bbox->maxx,bbox->maxy,level,&tr_x,&tr_y);
-  Mx = MAPCACHE_MAX(tr_x,bl_x);
-  My = MAPCACHE_MAX(tr_y,bl_y);
-  mx = MAPCACHE_MIN(tr_x,bl_x);
-  my = MAPCACHE_MIN(tr_y,bl_y);
+  Mx = MAPCACHE_MAX(MAPCACHE_MIN(MAPCACHE_MAX(tr_x,bl_x),grid_link->grid_limits[level].maxx),grid_link->grid_limits[level].minx);
+  My = MAPCACHE_MAX(MAPCACHE_MIN(MAPCACHE_MAX(tr_y,bl_y),grid_link->grid_limits[level].maxy),grid_link->grid_limits[level].miny);
+  mx = MAPCACHE_MIN(MAPCACHE_MAX(MAPCACHE_MIN(tr_x,bl_x),grid_link->grid_limits[level].minx),grid_link->grid_limits[level].maxx);
+  my = MAPCACHE_MIN(MAPCACHE_MAX(MAPCACHE_MIN(tr_y,bl_y),grid_link->grid_limits[level].miny),grid_link->grid_limits[level].maxy);
   *ntiles = (Mx-mx+1)*(My-my+1);
   i=0;
   *tiles = (mapcache_tile**)apr_pcalloc(ctx->pool, *ntiles*sizeof(mapcache_tile*));
@@ -340,7 +340,7 @@ mapcache_image* mapcache_tileset_assemble_map_tiles(mapcache_context *ctx, mapca
   } else {
     switch(mode) {
       case MAPCACHE_RESAMPLE_BILINEAR:
-        mapcache_image_copy_resampled_bilinear(ctx,srcimage,image,dstminx,dstminy,hf,vf);
+        mapcache_image_copy_resampled_bilinear(ctx,srcimage,image,dstminx,dstminy,hf,vf,0);
         break;
       default:
         mapcache_image_copy_resampled_nearest(ctx,srcimage,image,dstminx,dstminy,hf,vf);
@@ -691,7 +691,7 @@ void mapcache_tileset_assemble_out_of_zoom_tile(mapcache_context *ctx, mapcache_
      * ctx->log(ctx, MAPCACHE_DEBUG, "factor: %g. start: %g,%g (im size: %g)",scalefactor,dstminx,dstminy,scalefactor*256);
      */
     if(scalefactor <= tile->grid_link->grid->tile_sx/2) /*FIXME: might fail for non-square tiles, also check tile_sy */
-      mapcache_image_copy_resampled_bilinear(ctx,childtile->raw_image,tile->raw_image,dstminx,dstminy,scalefactor,scalefactor);
+      mapcache_image_copy_resampled_bilinear(ctx,childtile->raw_image,tile->raw_image,dstminx,dstminy,scalefactor,scalefactor,1);
     else {
       /* no use going through bilinear resampling if the requested scalefactor maps less than 4 pixels onto the
       * resulting tile, plus pixman has some rounding bugs in this case, see
@@ -828,6 +828,7 @@ void mapcache_tileset_tile_get(mapcache_context *ctx, mapcache_tile *tile)
 
       mapcache_unlock_resource(ctx, mapcache_tileset_metatile_resource_key(ctx,mt));
     }
+    GC_CHECK_ERROR(ctx);
 
     /* the previous step has successfully finished, we can now query the cache to return the tile content */
     ret = tile->tileset->cache->tile_get(ctx, tile);