[GRASS-SVN] r40617 - grass/trunk/lib/raster

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Jan 22 07:04:14 EST 2010


Author: glynn
Date: 2010-01-22 07:04:13 -0500 (Fri, 22 Jan 2010)
New Revision: 40617

Modified:
   grass/trunk/lib/raster/gdal.c
Log:
Fix for stdcall symbols on Windows


Modified: grass/trunk/lib/raster/gdal.c
===================================================================
--- grass/trunk/lib/raster/gdal.c	2010-01-22 09:52:30 UTC (rev 40616)
+++ grass/trunk/lib/raster/gdal.c	2010-01-22 12:04:13 UTC (rev 40617)
@@ -121,6 +121,22 @@
 {
     load_library();
 
+# ifdef _WIN32
+    pGDALAllRegister = get_symbol("_GDALAllRegister at 0");
+    pGDALOpen = get_symbol("_GDALOpen at 8");
+    pGDALClose = get_symbol("_GDALClose at 4");
+    pGDALGetRasterBand = get_symbol("_GDALGetRasterBand at 8");
+    pGDALRasterIO = get_symbol("_GDALRasterIO at 48");
+    pGDALGetDriverByName = get_symbol("_GDALGetDriverByName at 4");
+    pGDALGetMetadataItem = get_symbol("_GDALGetMetadataItem at 12");
+    pGDALCreate = get_symbol("_GDALCreate at 28");
+    pGDALCreateCopy = get_symbol("_GDALCreateCopy at 28");
+    pGDALSetRasterNoDataValue = get_symbol("_GDALSetRasterNoDataValue at 12");
+    pGDALSetGeoTransform = get_symbol("_GDALSetGeoTransform at 8");
+    pGDALSetProjection = get_symbol("_GDALSetProjection at 8");
+    pGDALGetDriverShortName = get_symbol("_GDALGetDriverShortName at 4");
+    pGDALGetDatasetDriver = get_symbol("_GDALGetDatasetDriver at 4");
+#else
     pGDALAllRegister = get_symbol("GDALAllRegister");
     pGDALOpen = get_symbol("GDALOpen");
     pGDALClose = get_symbol("GDALClose");
@@ -135,6 +151,7 @@
     pGDALSetProjection = get_symbol("GDALSetProjection");
     pGDALGetDriverShortName = get_symbol("GDALGetDriverShortName");
     pGDALGetDatasetDriver = get_symbol("GDALGetDatasetDriver");
+#endif
 }
 
 #else /* GDAL_DYNAMIC */



More information about the grass-commit mailing list