Fix and wkt formating for delimited text provider test

qgis · May 26, 2015 · 13d67c09cc843680cabb881332814aaad74c5f58 · 13d67c0
1 parent 23ef9da
commit 13d67c09cc843680cabb881332814aaad74c5f58
Showing with 141 additions and 134 deletions.

+4 −0 src/core/geometry/qgsgeometry.cpp

+4 −1 src/core/geometry/qgsgeometryimport.cpp

+132 −132 tests/src/python/test_qgsdelimitedtextprovider_wanted.py

+1 −1 tests/testdata/delimitedtext/testwkt.csv
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -147,6 +147,10 @@ const QgsAbstractGeometryV2* QgsGeometry::geometry() const
 QgsGeometry* QgsGeometry::fromWkt( QString wkt )
 {
   QgsAbstractGeometryV2* geom = QgsGeometryImport::geomFromWkt( wkt );
+  if ( !geom )
+  {
+    return 0;
+  }
   return new QgsGeometry( geom );
 }
 

diff --git a/src/core/geometry/qgsgeometryimport.cpp b/src/core/geometry/qgsgeometryimport.cpp
@@ -140,7 +140,10 @@ QgsAbstractGeometryV2* QgsGeometryImport::geomFromWkt( const QString& text )
 
   if ( geom )
   {
-    geom->fromWkt( text );
+    if ( !geom->fromWkt( text ) )
+    {
+      delete geom; return 0;
+    }
   }
   return geom;
 }