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

[svn at osgeo.org]

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

Modified:
   trunk/mapserver/mapcache/src/geocache_seed.c
Log:
add advancement to seeder progress output
thomas.bonfort | 2011-07-03 19:00:14 +0200 (Sun, 03 Jul 2011)

Modified: trunk/mapserver/mapcache/src/geocache_seed.c
===================================================================
--- trunk/mapserver/mapcache/src/geocache_seed.c	2011-08-26 11:22:20 UTC (rev 12397)
+++ trunk/mapserver/mapcache/src/geocache_seed.c	2011-08-26 11:22:24 UTC (rev 12398)
@@ -98,16 +98,20 @@
    OGR_G_SetPoint_2D(mtbboxls,3,e[0],e[3]);
    OGR_G_SetPoint_2D(mtbboxls,4,e[0],e[1]);
    OGRGeometryH mtbbox = OGR_G_CreateGeometry(wkbPolygon);
-   OGR_G_AddGeometryDirectly(mtbbox,mtbboxls);
+   OGR_G_AddGeometry(mtbbox,mtbboxls);
    int i;
+   int intersects = 0;
    for(i=0;i<nClippers;i++) {
       OGRGeometryH clipper = clippers[i];
       OGRGeometryH clipresult;
       clipresult = OGR_G_Intersection(mtbbox,clipper);
       if(clipresult && !OGR_G_IsEmpty(clipresult))
-         return 1;
+         intersects = 1;
+      OGR_G_DestroyGeometry(clipresult);
    }
-   return 0;
+   OGR_G_DestroyGeometry(mtbbox);
+   OGR_G_DestroyGeometry(mtbboxls);
+   return intersects;
 
 
 }