[mapserver-commits] r10004 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-03-24 23:33:56 -0400 (Wed, 24 Mar 2010)
New Revision: 10004

Modified:
   trunk/mapserver/mapdrawgdal.c
Log:
do not use GDAL mask api unless we have gdal 1.5 or later (#2640)

Modified: trunk/mapserver/mapdrawgdal.c
===================================================================
--- trunk/mapserver/mapdrawgdal.c	2010-03-25 03:31:57 UTC (rev 10003)
+++ trunk/mapserver/mapdrawgdal.c	2010-03-25 03:33:56 UTC (rev 10004)
@@ -829,6 +829,7 @@
 /*      load it as massage it so it will function as our alpha for      */
 /*      transparency purposes.                                          */
 /* -------------------------------------------------------------------- */
+#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1500 
     if( hBandAlpha == NULL )
     {
         int nMaskFlags = GDALGetMaskFlags(hBand1); 
@@ -891,6 +892,7 @@
             } 
         } 
     }
+#endif /* defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1500 */
 
 /* -------------------------------------------------------------------- */
 /*      Single band plus colormap with alpha blending to 8bit.          */