OGR style support only with GDAL >=1.7

jef-n · jef-n · commit 9bcddc5d00da · 2013-01-31T00:15:19.000+01:00
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}")

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@`
`40`	`40`	`#include <cstdlib> // size_t`
`41`	`41`	`#include <limits> // std::numeric_limits`
`42`	`42`
`43`		`-#include <ogr_api.h>`
`44`	`43`	`#include <ogr_srs_api.h>`
`45`	`44`	`#include <cpl_error.h>`
`46`	`45`	`#include <cpl_conv.h>`
`@@ -451,11 +450,13 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2*`
`451`	`450`	`int nSymbolLayers = ( *symbolIt )->symbolLayerCount();`
`452`	`451`	`for ( int i = 0; i < nSymbolLayers; ++i )`
`453`	`452`	`{`
`454`		`- /QMap< QgsSymbolLayerV2, QString >::const_iterator it = mSymbolLayerTable.find( (*symbolIt)->symbolLayer( i ) );`
`455`		`- if( it == mSymbolLayerTable.constEnd() )`
	`453`	`+#if 0`
	`454`	`+ QMap< QgsSymbolLayerV2, QString >::const_iterator it = mSymbolLayerTable.find(( symbolIt )->symbolLayer( i ) );`
	`455`	`+ if ( it == mSymbolLayerTable.constEnd() )`
`456`	`456`	`{`
`457`		`- continue;`
`458`		`- }*/`
	`457`	`+ continue;`
	`458`	`+ }`
	`459`	`+#endif`
`459`	`460`	`double mmsf = mmScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );`
`460`	`461`	`double musf = mapUnitScaleFactor( mSymbologyScaleDenominator, ( *symbolIt )->outputUnit(), outputUnit );`
`461`	`462`
`@@ -549,7 +550,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )`
`549`	`550`	`.arg( attrValue.toString() );`
`550`	`551`	`QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );`
`551`	`552`	`mError = ErrFeatureWriteFailed;`
`552`		`- return false;`
	`553`	`+ return 0;`
`553`	`554`	`}`
`554`	`555`	`}`
`555`	`556`
`@@ -584,7 +585,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )`
`584`	`585`	`mError = ErrFeatureWriteFailed;`
`585`	`586`	`QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );`
`586`	`587`	`OGR_F_Destroy( poFeature );`
`587`		`- return false;`
	`588`	`+ return 0;`
`588`	`589`	`}`
`589`	`590`
`590`	`591`	`OGRErr err = OGR_G_ImportFromWkb( mGeom2, geom->asWkb(), geom->wkbSize() );`
`@@ -595,7 +596,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )`
`595`	`596`	`mError = ErrFeatureWriteFailed;`
`596`	`597`	`QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );`
`597`	`598`	`OGR_F_Destroy( poFeature );`
`598`		`- return false;`
	`599`	`+ return 0;`
`599`	`600`	`}`
`600`	`601`
`601`	`602`	`// pass ownership to geometry`
`@@ -611,7 +612,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )`
`611`	`612`	`mError = ErrFeatureWriteFailed;`
`612`	`613`	`QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );`
`613`	`614`	`OGR_F_Destroy( poFeature );`
`614`		`- return false;`
	`615`	`+ return 0;`
`615`	`616`	`}`
`616`	`617`
`617`	`618`	`// set geometry (ownership is not passed to OGR)`
`@@ -1187,6 +1188,7 @@ void QgsVectorFileWriter::createSymbolLayerTable( QgsVectorLayer* vl, const Qgs`
`1187`	`1188`	`mapUnits = ct->destCRS().mapUnits();`
`1188`	`1189`	`}`
`1189`	`1190`
	`1191`	`+#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1700`
`1190`	`1192`	`mSymbolLayerTable.clear();`
`1191`	`1193`	`OGRStyleTableH ogrStyleTable = OGR_STBL_Create();`
`1192`	`1194`	`OGRStyleMgrH styleManager = OGR_SM_Create( ogrStyleTable );`
`@@ -1210,10 +1212,11 @@ void QgsVectorFileWriter::createSymbolLayerTable( QgsVectorLayer* vl, const Qgs`
`1210`	`1212`	`}`
`1211`	`1213`	`}`
`1212`	`1214`	`OGR_DS_SetStyleTableDirectly( ds, ogrStyleTable );`
	`1215`	`+#endif`
`1213`	`1216`	`}`
`1214`	`1217`
`1215`	`1218`	`QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels( QgsVectorLayer* layer, QgsFeatureIterator& fit,`
`1216`		`- const QgsCoordinateTransform* ct, QString* errorMessage )`
	`1219`	`+ const QgsCoordinateTransform* ct, QString* errorMessage )`
`1217`	`1220`	`{`
`1218`	`1221`	`if ( !layer \|\| !layer->isUsingRendererV2() )`
`1219`	`1222`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ SET (SA_SRCS`
`9`	`9`	`)`
`10`	`10`	`SET (SA_MOC_HDRS`
`11`	`11`	`qgssqlanywhereprovider.h`
`12`		`- qgssqlanywherefeatureiterator.h`
`13`	`12`	`)`
`14`	`13`
`15`	`14`	`ADD_DEFINITIONS("-DSACONN_EXPORT=${DLLEXPORT}")`