don't measure empty geometries and also return success when exports g…

…eos points to wkb git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12617 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 24, 2009 · 54afc48 · 54afc48
1 parent e0c98fb
commit 54afc48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -175,6 +175,9 @@ bool QgsDistanceArea::setEllipsoid( const QString& ellipsoid )
 
 double QgsDistanceArea::measure( QgsGeometry* geometry )
 {
+  if ( !geometry )
+    return 0.0;
+
   unsigned char* wkb = geometry->asWkb();
   unsigned char* ptr;
   unsigned int wkbType;

diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -1198,8 +1198,8 @@ bool QgsGeometry::insertVertex( double x, double y,
   // Bounds checking
   if ( beforeVertex < 0 )
   {
-    ( *new_sequence ) = 0;
-    return FALSE;
+    *new_sequence = 0;
+    return false;
   }
 
   unsigned int numPoints;
@@ -4335,7 +4335,8 @@ bool QgsGeometry::exportGeosToWkb()
       memcpy( mGeometry + 5, &x, sizeof( double ) );
       memcpy( mGeometry + 13, &y, sizeof( double ) );
 
-      break;
+      mDirtyWkb = false;
+      return true;
     } // case GEOS_GEOM::GEOS_POINT
 
     case GEOS_LINESTRING:            // a linestring