[Thuban-commits] r2866 - in trunk/thuban: . libraries/thuban

[scm-commit@wald.intevation.org]

Author: dpinte
Date: 2008-11-18 10:49:59 +0100 (Tue, 18 Nov 2008)
New Revision: 2866

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/libraries/thuban/gdalwarp.cpp
Log:
2008-11-18 Didrik Pinte <dpinte at dipole-consulting.com>

    * libraries/thuban/gdalwarp.cpp : support the use of GDAL MEM driver for
      GDAL versions >= 1.5



Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2008-09-05 19:45:58 UTC (rev 2865)
+++ trunk/thuban/ChangeLog	2008-11-18 09:49:59 UTC (rev 2866)
@@ -1,3 +1,8 @@
+2008-11-18 Didrik Pinte <dpinte at dipole-consulting.com>
+
+    * libraries/thuban/gdalwarp.cpp : support the use of GDAL MEM driver for GDAL
+      versions >= 1.5
+
 2008-007-24 Bernhard Reiter <bernhard at intevation.de>
 	
 	* NEWS: Added summary of changes since the 1.2.1 release. Fixed some

Modified: trunk/thuban/libraries/thuban/gdalwarp.cpp
===================================================================
--- trunk/thuban/libraries/thuban/gdalwarp.cpp	2008-09-05 19:45:58 UTC (rev 2865)
+++ trunk/thuban/libraries/thuban/gdalwarp.cpp	2008-11-18 09:49:59 UTC (rev 2866)
@@ -175,8 +175,14 @@
 static int             nForcePixels=0, nForceLines=0;
 static int             bEnableDstAlpha = FALSE, bEnableSrcAlpha = FALSE;
 static int             bMakeMask, bMakeAlpha, bInvertMask;
-const char             *pszSrcFilename = NULL, *pszDstFilename = "MEM:::";
+const char             *pszSrcFilename = NULL;
 
+#	if GDAL_VERSION_MINOR < 5
+const char			   *pszDstFilename = "MEM:::";
+# else
+const char			   *pszDstFilename = "IMG:::";
+# endif
+
 static PyMethodDef gdalwarp_methods[] = {
     { "ProjectRasterFile", ProjectRasterFile, METH_VARARGS },
     { "get_gdal_version", get_gdal_version, METH_VARARGS },