Removed GDAL dependencies where easily possible

qgis · Dec 17, 2012 · b662077 · b662077
1 parent d435bfc
commit b662077
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 53 deletions.
diff --git a/src/core/raster/qgsrasterblock.cpp b/src/core/raster/qgsrasterblock.cpp
@@ -527,34 +527,33 @@ QByteArray QgsRasterBlock::valueBytes( QGis::DataType theDataType, double theVal
   QByteArray ba;
   ba.resize(( int )size );
   char * data = ba.data();
-  unsigned char uc;
-  unsigned short us;
-  short s;
-  unsigned int ui;
-  int i;
+  quint8 uc;
+  quint16 us;
+  qint16 s;
+  quint32 ui;
+  qint32 i;
   float f;
   double d;
-  // TODO: define correct data types (typedef) like in GDAL
   switch ( theDataType )
   {
     case QGis::Byte:
-      uc = ( unsigned char )theValue;
+      uc = ( quint8 )theValue;
       memcpy( data, &uc, size );
       break;
     case QGis::UInt16:
-      us = ( unsigned short )theValue;
+      us = ( quint16 )theValue;
       memcpy( data, &us, size );
       break;
     case QGis::Int16:
-      s = ( short )theValue;
+      s = ( qint16 )theValue;
       memcpy( data, &s, size );
       break;
     case QGis::UInt32:
-      ui = ( unsigned int )theValue;
+      ui = ( quint32 )theValue;
       memcpy( data, &ui, size );
       break;
     case QGis::Int32:
-      i = ( int )theValue;
+      i = ( qint32 )theValue;
       memcpy( data, &i, size );
       break;
     case QGis::Float32:

diff --git a/src/core/raster/qgsrasterblock.h b/src/core/raster/qgsrasterblock.h
@@ -24,8 +24,6 @@
 #include "qgslogger.h"
 #include "qgsrectangle.h"
 
-#include "gdal.h" // only for data types for now
-
 /** \ingroup core
  * Raster data container.
  */
@@ -332,19 +330,19 @@ inline double QgsRasterBlock::readValue( void *data, QGis::DataType type, size_t
   switch ( type )
   {
     case QGis::Byte:
-      return ( double )(( GByte * )data )[index];
+      return ( double )(( quint8 * )data )[index];
       break;
     case QGis::UInt16:
-      return ( double )(( GUInt16 * )data )[index];
+      return ( double )(( quint16 * )data )[index];
       break;
     case QGis::Int16:
-      return ( double )(( GInt16 * )data )[index];
+      return ( double )(( qint16 * )data )[index];
       break;
     case QGis::UInt32:
-      return ( double )(( GUInt32 * )data )[index];
+      return ( double )(( quint32 * )data )[index];
       break;
     case QGis::Int32:
-      return ( double )(( GInt32 * )data )[index];
+      return ( double )(( qint32 * )data )[index];
       break;
     case QGis::Float32:
       return ( double )(( float * )data )[index];
@@ -369,19 +367,19 @@ inline void QgsRasterBlock::writeValue( void *data, QGis::DataType type, size_t
   switch ( type )
   {
     case QGis::Byte:
-      (( GByte * )data )[index] = ( GByte ) value;
+      (( quint8 * )data )[index] = ( quint8 ) value;
       break;
     case QGis::UInt16:
-      (( GUInt16 * )data )[index] = ( GUInt16 ) value;
+      (( quint16 * )data )[index] = ( quint16 ) value;
       break;
     case QGis::Int16:
-      (( GInt16 * )data )[index] = ( GInt16 ) value;
+      (( qint16 * )data )[index] = ( qint16 ) value;
       break;
     case QGis::UInt32:
-      (( GUInt32 * )data )[index] = ( GUInt32 ) value;
+      (( quint32 * )data )[index] = ( quint32 ) value;
       break;
     case QGis::Int32:
-      (( GInt32 * )data )[index] = ( GInt32 ) value;
+      (( qint32 * )data )[index] = ( qint32 ) value;
       break;
     case QGis::Float32:
       (( float * )data )[index] = ( float ) value;

diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp
@@ -26,8 +26,6 @@
 #include <QTextStream>
 #include <QMessageBox>
 
-#include "gdal.h"
-
 QgsRasterFileWriter::QgsRasterFileWriter( const QString& outputUrl ):
     mOutputUrl( outputUrl ), mOutputProviderKey( "gdal" ), mOutputFormat( "GTiff" ),
     mTiledMode( false ), mMaxTileWidth( 500 ), mMaxTileHeight( 500 ),
@@ -726,6 +724,7 @@ void QgsRasterFileWriter::buildPyramids( const QString& filename )
   }
 }
 
+#if 0
 int QgsRasterFileWriter::pyramidsProgress( double dfComplete, const char *pszMessage, void* pData )
 {
   Q_UNUSED( pszMessage );
@@ -743,6 +742,7 @@ int QgsRasterFileWriter::pyramidsProgress( double dfComplete, const char *pszMes
   }
   return 1;
 }
+#endif
 
 void QgsRasterFileWriter::createVRT( int xSize, int ySize, const QgsCoordinateReferenceSystem& crs, double* geoTransform )
 {

diff --git a/src/core/raster/qgsrasterfilewriter.h b/src/core/raster/qgsrasterfilewriter.h
@@ -116,7 +116,7 @@ class CORE_EXPORT QgsRasterFileWriter
     void addToVRT( const QString& filename, int band, int xSize, int ySize, int xOffset, int yOffset );
     void buildPyramids( const QString& filename );
 
-    static int pyramidsProgress( double dfComplete, const char *pszMessage, void* pData );
+    //static int pyramidsProgress( double dfComplete, const char *pszMessage, void* pData );
 
     /**Create provider and datasource for a part image (vrt mode)*/
     QgsRasterDataProvider* createPartProvider( const QgsRectangle& extent, int nCols, int iterCols, int iterRows,

diff --git a/src/core/raster/qgsrasterinterface.h b/src/core/raster/qgsrasterinterface.h
@@ -26,8 +26,6 @@
 #include "qgsrasterblock.h"
 #include "qgsrectangle.h"
 
-#include "gdal.h"
-
 /** \ingroup core
  * Base class for processing modules.
  */

diff --git a/src/gui/qgsrasterpyramidsoptionswidget.cpp b/src/gui/qgsrasterpyramidsoptionswidget.cpp
@@ -19,11 +19,6 @@
 #include "qgslogger.h"
 #include "qgsdialog.h"
 
-#include "gdal.h"
-#include "cpl_string.h"
-#include "cpl_conv.h"
-#include "cpl_minixml.h"
-
 #include <QSettings>
 #include <QInputDialog>
 #include <QMessageBox>

diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -51,7 +51,7 @@ extern "C"
 #include <grass/glocale.h>
 }
 
-#include <gdal.h>         // to collect version information
+//#include <gdal.h>         // to collect version information
 
 bool QgsGrassModule::mExecPathInited = 0;
 QStringList QgsGrassModule::mExecPath;

diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp
@@ -60,6 +60,14 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 
+#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
+#define TO8F(x) (x).toUtf8().constData()
+#define FROM8(x) QString::fromUtf8(x)
+#else
+#define TO8F(x) QFile::encodeName( x ).constData()
+#define FROM8(x) QString::fromLocal8Bit(x)
+#endif
+
 #define ERR(message) QGS_ERROR_MESSAGE(message,"WCS provider")
 #define SRVERR(message) QGS_ERROR_MESSAGE(message,"WCS server")
 

diff --git a/src/providers/wcs/qgswcsprovider.h b/src/providers/wcs/qgswcsprovider.h
@@ -45,14 +45,6 @@ class QNetworkRequest;
 #define CPL_SUPRESS_CPLUSPLUS
 #include <gdal.h>
 
-#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
-#define TO8F(x) (x).toUtf8().constData()
-#define FROM8(x) QString::fromUtf8(x)
-#else
-#define TO8F(x) QFile::encodeName( x ).constData()
-#define FROM8(x) QString::fromLocal8Bit(x)
-#endif
-
 /**
 
   \brief Data provider for OGC WCS layers.

diff --git a/src/providers/wcs/qgswcssourceselect.cpp b/src/providers/wcs/qgswcssourceselect.cpp
@@ -27,17 +27,6 @@
 
 #include <QWidget>
 
-#define CPL_SUPRESS_CPLUSPLUS
-#include <gdal.h>
-
-#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
-#define TO8F(x) (x).toUtf8().constData()
-#define FROM8(x) QString::fromUtf8(x)
-#else
-#define TO8F(x) QFile::encodeName( x ).constData()
-#define FROM8(x) QString::fromLocal8Bit(x)
-#endif
-
 QgsWCSSourceSelect::QgsWCSSourceSelect( QWidget * parent, Qt::WFlags fl, bool managerMode, bool embeddedMode )
     : QgsOWSSourceSelect( "WCS", parent, fl, managerMode, embeddedMode )
 {