Small backported raster changes from master

qgis · Sep 18, 2011 · a0d27a9 · a0d27a9
1 parent 6359ebc
commit a0d27a9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -14,7 +14,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/* $Id$ */
+
 
 //qt includes
 #include <QBitmap>

diff --git a/src/app/qgsrasterlayerproperties.h b/src/app/qgsrasterlayerproperties.h
@@ -16,7 +16,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/* $Id$ */
+
 #ifndef QGSRASTERLAYERPROPERTIES_H
 #define QGSRASTERLAYERPROPERTIES_H
 

diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -43,15 +43,6 @@
 #include "qgsrastershaderfunction.h"
 #include "qgsrasterdataprovider.h"
 
-#define CPL_SUPRESS_CPLUSPLUS
-#include <gdal.h>
-/** \ingroup core
- * A call back function for showing progress of gdal operations.
- */
-int CPL_STDCALL progressCallback( double dfComplete,
-                                  const char *pszMessage,
-                                  void * pProgressArg );
-
 //
 // Forward declarations
 //