Changeset 499 for trunk

Timestamp:

Aug 21, 2014, 4:13:17 PM (10 years ago)

Author:

djay

Message:

Small fix in applyTwo for services taking two parameters and returning a FeatureCollection?.

Location:

trunk/zoo-project/zoo-services/ogr/base-vect-ops

Files:

• Makefile (modified) (1 diff)
• service.c (modified) (3 diffs)

trunk/zoo-project/zoo-services/ogr/base-vect-ops/Makefile

@@ -10 +10 @@
 
 cgi-env/ogr_service.zo: service.c
-        g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} ${JSLDFLAGS} ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} `geos-config --libs` ${MS_FILES} -lfcgi
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} ${JSLDFLAGS} ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} `geos-config --libs` ${MS_FILES} -lfcgi  -lpthread
+
 
 clean:

trunk/zoo-project/zoo-services/ogr/base-vect-ops/service.c

@@ -1089 +1089 @@
             }
             
-            OGRFeatureDefn *poFDefn = poLayer1->GetLayerDefn();
+            OGRFeatureDefn *poFDefn = poLayer2->GetLayerDefn();
             int iField;
             int hasMmField=0;
@@ -1140 +1140 @@
                       return SERVICE_FAILED;
                     }
-                  OGRFeature::DestroyFeature( poFeature1 );
                   OGRFeature::DestroyFeature( poFeature2 );
                   if(!poDstFeature->GetGeometryRef()->IsEmpty())
@@ -1152 +1151 @@
               }
             }
+            OGRFeature::DestroyFeature( poFeature1 );
           }
       }