Changeset 371 for trunk

Timestamp:

Oct 11, 2012, 11:45:00 AM (12 years ago)

Author:

djay

Message:

Make GdalExtractProfile? Service working on windows platforms.

Location:

trunk/zoo-project/zoo-services/gdal/profile

Files:

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

trunk/zoo-project/zoo-services/gdal/profile/Makefile

@@ -4 +4 @@
 CC=gcc
 
-cgi-env/gdal_profile_service.zo: service.c
-        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_profile_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
+cgi-env/profile_service.zo: service.c
+        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/profile_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
 
 clean:

trunk/zoo-project/zoo-services/gdal/profile/service.c

@@ -40 +40 @@
 #endif
 
+#ifdef WIN32
+__declspec(dllexport)
+#endif
 #ifdef ZOO_SERVICE
 int GdalExtractProfile(maps*& conf,maps*& inputs,maps*& outputs)
@@ -82 +85 @@
         adfMinMax[1] = GDALGetRasterMaximum( hBand, &bGotMax );
         if( ! (bGotMin && bGotMax) )
-            GDALComputeRasterMinMax( hBand, TRUE, adfMinMax );
-
+          GDALComputeRasterMinMax( hBand, TRUE, adfMinMax );
 #ifdef ZOO_SERVICE
           tmp1=getMapFromMaps(inputs,"Geometry","value");
@@ -90 +92 @@
           OGRGeometryH geometry=OGR_G_CreateGeometryFromJson(argv[2]);
 #endif
+
           OGR_G_Segmentize(geometry, adfGeoTransform[1]);
           int nbGeom=OGR_G_GetPointCount(geometry);