Skip to content

Commit

Permalink
Small backported raster changes from master
Browse files Browse the repository at this point in the history
  • Loading branch information
timlinux committed Sep 18, 2011
1 parent 6359ebc commit a0d27a9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/app/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id$ */


//qt includes
#include <QBitmap>
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsrasterlayerproperties.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id$ */

#ifndef QGSRASTERLAYERPROPERTIES_H
#define QGSRASTERLAYERPROPERTIES_H

Expand Down
9 changes: 0 additions & 9 deletions src/core/raster/qgsrasterlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
Expand Down

0 comments on commit a0d27a9

Please sign in to comment.