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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:22:20 -0700 (Fri, 26 Aug 2011)
New Revision: 12397

Modified:
   trunk/mapserver/mapcache/src/imageio_jpeg.c
   trunk/mapserver/mapcache/src/imageio_png.c
Log:
use geos prepared geometries for intersection tests
thomas.bonfort | 2011-07-03 18:20:29 +0200 (Sun, 03 Jul 2011)

Modified: trunk/mapserver/mapcache/src/imageio_jpeg.c
===================================================================
--- trunk/mapserver/mapcache/src/imageio_jpeg.c	2011-08-26 11:22:09 UTC (rev 12396)
+++ trunk/mapserver/mapcache/src/imageio_jpeg.c	2011-08-26 11:22:20 UTC (rev 12397)
@@ -274,12 +274,8 @@
    empty->h = height;
    empty->stride = width * 4;
 
-   /*temp switch format compression*/
-   int tmpquality = f->quality;
-   f->quality = 1;
    geocache_buffer *buf = format->write(ctx,empty,format);
    apr_pool_destroy(pool);
-   f->quality = tmpquality;
    return buf;
 }
 

Modified: trunk/mapserver/mapcache/src/imageio_png.c
===================================================================
--- trunk/mapserver/mapcache/src/imageio_png.c	2011-08-26 11:22:09 UTC (rev 12396)
+++ trunk/mapserver/mapcache/src/imageio_png.c	2011-08-26 11:22:20 UTC (rev 12397)
@@ -1093,12 +1093,8 @@
    empty->h = height;
    empty->stride = width * 4;
 
-   /*temp switch format compression*/
-   geocache_compression_type tmpcomp = f->compression_level;
-   f->compression_level = GEOCACHE_COMPRESSION_BEST;
    geocache_buffer *buf = format->write(ctx,empty,format);
    apr_pool_destroy(pool);
-   f->compression_level = tmpcomp;
    return buf;
 }