Support writing LongLong types with GDAL 2

qgis · Feb 4, 2016 · 5133694 · 5133694
1 parent 163894d
commit 5133694
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -1757,18 +1757,32 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )
 
     switch ( attrValue.type() )
     {
+#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 2000000
       case QVariant::Int:
+      case QVariant::UInt:
         OGR_F_SetFieldInteger( poFeature, ogrField, attrValue.toInt() );
         break;
-      case QVariant::Double:
-        OGR_F_SetFieldDouble( poFeature, ogrField, attrValue.toDouble() );
+      case QVariant::LongLong:
+      case QVariant::ULongLong:
+        OGR_F_SetFieldInteger64( poFeature, ogrField, attrValue.toLongLong() );
+        break;
+      case QVariant::String:
+        OGR_F_SetFieldString( poFeature, ogrField, mCodec->fromUnicode( attrValue.toString() ).data() );
+        break;
+#else
+      case QVariant::Int:
+        OGR_F_SetFieldInteger( poFeature, ogrField, attrValue.toInt() );
         break;
+      case QVariant::String:
       case QVariant::LongLong:
       case QVariant::UInt:
       case QVariant::ULongLong:
-      case QVariant::String:
         OGR_F_SetFieldString( poFeature, ogrField, mCodec->fromUnicode( attrValue.toString() ).data() );
         break;
+#endif
+      case QVariant::Double:
+        OGR_F_SetFieldDouble( poFeature, ogrField, attrValue.toDouble() );
+        break;
       case QVariant::Date:
         OGR_F_SetFieldDateTime( poFeature, ogrField,
                                 attrValue.toDate().year(),