fix build with GDAL <=1.9

qgis · Jan 23, 2014 · 49a807a · 49a807a
1 parent 9aa4155
commit 49a807a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -111,14 +111,16 @@ bool QgsOgrFeatureIterator::prepareSimplification( const QgsSimplifyMethod& simp
     QgsSimplifyMethod::MethodType methodType = simplifyMethod.methodType();
     Q_UNUSED( methodType);
 
-#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION) && GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
+#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION)
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
     if ( methodType == QgsSimplifyMethod::OptimizeForRendering )
     {
       int simplifyFlags = QgsMapToPixelSimplifier::SimplifyGeometry | QgsMapToPixelSimplifier::SimplifyEnvelope;
       mGeometrySimplifier = new QgsOgrMapToPixelSimplifier( simplifyFlags, simplifyMethod.tolerance() );
       return true;
     }
 #endif
+#endif
 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1900
     if ( methodType == QgsSimplifyMethod::PreserveTopology )
     {
@@ -134,12 +136,14 @@ bool QgsOgrFeatureIterator::prepareSimplification( const QgsSimplifyMethod& simp
 
 bool QgsOgrFeatureIterator::providerCanSimplify( QgsSimplifyMethod::MethodType methodType ) const
 {
-#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION) && GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
+#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION)
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
   if ( methodType == QgsSimplifyMethod::OptimizeForRendering )
   {
     return true;
   }
 #endif
+#endif
 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1900
   if ( methodType == QgsSimplifyMethod::PreserveTopology )
   {

diff --git a/src/providers/ogr/qgsogrgeometrysimplifier.cpp b/src/providers/ogr/qgsogrgeometrysimplifier.cpp
@@ -56,11 +56,12 @@ bool QgsOgrTopologyPreservingSimplifier::simplifyGeometry( OGRGeometryH geometry
 
   return true;
 }
-#endif
+#endif // GDAL_VERSION_NUM >= 1900
 
 /***************************************************************************/
 
-#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION) && GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
+#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION)
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
 
 QgsOgrMapToPixelSimplifier::QgsOgrMapToPixelSimplifier( int simplifyFlags, double map2pixelTol )
     : QgsMapToPixelSimplifier( simplifyFlags, map2pixelTol )
@@ -269,4 +270,5 @@ bool QgsOgrMapToPixelSimplifier::simplifyGeometry( OGRGeometryH geometry )
   return false;
 }
 
-#endif
+#endif // GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
+#endif // defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION)
diff --git a/src/providers/ogr/qgsogrgeometrysimplifier.h b/src/providers/ogr/qgsogrgeometrysimplifier.h
@@ -52,7 +52,8 @@ class QgsOgrTopologyPreservingSimplifier : public QgsOgrAbstractGeometrySimplifi
 };
 #endif
 
-#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION) && GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
+#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION)
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
 /**
  * OGR implementation of GeometrySimplifier using the "MapToPixel" algorithm
  *
@@ -88,6 +89,7 @@ class QgsOgrMapToPixelSimplifier : public QgsOgrAbstractGeometrySimplifier, QgsM
     //! Simplifies the specified geometry
     virtual bool simplifyGeometry( OGRGeometryH geometry );
 };
-#endif
+#endif // GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
+#endif // defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION)
 
 #endif // QGSOGRGEOMETRYSIMPLIFIER_H
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1495,9 +1495,11 @@ int QgsOgrProvider::capabilities() const
     }
 
     // supports geometry simplification on provider side
-#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION) && GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
+#if defined(GDAL_VERSION_NUM) && defined(GDAL_COMPUTE_VERSION)
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,11,0)
     ability |= QgsVectorDataProvider::SimplifyGeometries;
 #endif
+#endif
 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1900
     ability |= QgsVectorDataProvider::SimplifyGeometriesWithTopologicalValidation;
 #endif