OGR style support only with GDAL >=1.7

qgis · Jan 30, 2013 · 9bcddc5 · 9bcddc5
1 parent 121ddc7
commit 9bcddc5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -40,7 +40,6 @@
 #include <cstdlib> // size_t
 #include <limits> // std::numeric_limits
 
-#include <ogr_api.h>
 #include <ogr_srs_api.h>
 #include <cpl_error.h>
 #include <cpl_conv.h>
@@ -451,11 +450,13 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2*
       int nSymbolLayers = ( *symbolIt )->symbolLayerCount();
       for ( int i = 0; i < nSymbolLayers; ++i )
       {
-        /*QMap< QgsSymbolLayerV2*, QString >::const_iterator it = mSymbolLayerTable.find( (*symbolIt)->symbolLayer( i ) );
-        if( it == mSymbolLayerTable.constEnd() )
+#if 0
+        QMap< QgsSymbolLayerV2*, QString >::const_iterator it = mSymbolLayerTable.find(( *symbolIt )->symbolLayer( i ) );
+        if ( it == mSymbolLayerTable.constEnd() )
         {
-            continue;
-        }*/
+          continue;
+        }
+#endif
         double mmsf = mmScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );
         double musf = mapUnitScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );
 
@@ -549,7 +550,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )
                         .arg( attrValue.toString() );
         QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );
         mError = ErrFeatureWriteFailed;
-        return false;
+        return 0;
     }
   }
 
@@ -584,7 +585,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )
         mError = ErrFeatureWriteFailed;
         QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );
         OGR_F_Destroy( poFeature );
-        return false;
+        return 0;
       }
 
       OGRErr err = OGR_G_ImportFromWkb( mGeom2, geom->asWkb(), geom->wkbSize() );
@@ -595,7 +596,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )
         mError = ErrFeatureWriteFailed;
         QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );
         OGR_F_Destroy( poFeature );
-        return false;
+        return 0;
       }
 
       // pass ownership to geometry
@@ -611,7 +612,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )
         mError = ErrFeatureWriteFailed;
         QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );
         OGR_F_Destroy( poFeature );
-        return false;
+        return 0;
       }
 
       // set geometry (ownership is not passed to OGR)
@@ -1187,6 +1188,7 @@ void QgsVectorFileWriter::createSymbolLayerTable( QgsVectorLayer* vl,  const Qgs
     mapUnits = ct->destCRS().mapUnits();
   }
 
+#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1700
   mSymbolLayerTable.clear();
   OGRStyleTableH ogrStyleTable = OGR_STBL_Create();
   OGRStyleMgrH styleManager = OGR_SM_Create( ogrStyleTable );
@@ -1210,10 +1212,11 @@ void QgsVectorFileWriter::createSymbolLayerTable( QgsVectorLayer* vl,  const Qgs
     }
   }
   OGR_DS_SetStyleTableDirectly( ds, ogrStyleTable );
+#endif
 }
 
 QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels( QgsVectorLayer* layer, QgsFeatureIterator& fit,
-                                                                                  const QgsCoordinateTransform* ct, QString* errorMessage )
+    const QgsCoordinateTransform* ct, QString* errorMessage )
 {
   if ( !layer || !layer->isUsingRendererV2() )
   {

diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
@@ -22,6 +22,7 @@
 #include "qgsvectorlayer.h"
 #include "qgsfield.h"
 #include "qgssymbolv2.h"
+#include <ogr_api.h>
 
 #include <QPair>
 
@@ -178,7 +179,9 @@ class CORE_EXPORT QgsVectorFileWriter
 
     SymbologyExport mSymbologyExport;
 
+#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1700
     QMap< QgsSymbolLayerV2*, QString > mSymbolLayerTable;
+#endif
 
     /**Scale for symbology export (e.g. for symbols units in map units)*/
     double mSymbologyScaleDenominator;

diff --git a/src/providers/sqlanywhere/CMakeLists.txt b/src/providers/sqlanywhere/CMakeLists.txt
@@ -9,7 +9,6 @@ SET (SA_SRCS
 )
 SET (SA_MOC_HDRS
   qgssqlanywhereprovider.h
-  qgssqlanywherefeatureiterator.h
 )
 
 ADD_DEFINITIONS("-DSACONN_EXPORT=${DLLEXPORT}")