Changeset 499 for trunk


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-services/ogr/base-vect-ops/Makefile

    r491 r499  
    1010
    1111cgi-env/ogr_service.zo: service.c
    12         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
     12        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
     13
    1314
    1415clean:
  • trunk/zoo-project/zoo-services/ogr/base-vect-ops/service.c

    r497 r499  
    10891089            }
    10901090           
    1091             OGRFeatureDefn *poFDefn = poLayer1->GetLayerDefn();
     1091            OGRFeatureDefn *poFDefn = poLayer2->GetLayerDefn();
    10921092            int iField;
    10931093            int hasMmField=0;
     
    11401140                      return SERVICE_FAILED;
    11411141                    }
    1142                   OGRFeature::DestroyFeature( poFeature1 );
    11431142                  OGRFeature::DestroyFeature( poFeature2 );
    11441143                  if(!poDstFeature->GetGeometryRef()->IsEmpty())
     
    11521151              }
    11531152            }
     1153            OGRFeature::DestroyFeature( poFeature1 );
    11541154          }
    11551155      }
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png