Merge branch 'master' of github.com:qgis/Quantum-GIS

mhugent · mhugent · commit 705927e0871e · 2013-12-05T17:19:16.000+01:00
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -5221,6 +5221,12 @@ bool QgsGeometry::exportGeosToWkb() const
 
 bool QgsGeometry::convertToMultiType()
 {
+  // TODO: implement with GEOS
+  if ( mDirtyWkb )
+  {
+    exportGeosToWkb();
+  }
+
   if ( !mGeometry )
   {
     return false;

Original file line number	Diff line number	Diff line change
`@@ -5221,6 +5221,12 @@ bool QgsGeometry::exportGeosToWkb() const`
`5221`	`5221`
`5222`	`5222`	`bool QgsGeometry::convertToMultiType()`
`5223`	`5223`	`{`
	`5224`	`+ // TODO: implement with GEOS`
	`5225`	`+ if ( mDirtyWkb )`
	`5226`	`+ {`
	`5227`	`+ exportGeosToWkb();`
	`5228`	`+ }`
	`5229`	`+`
`5224`	`5230`	`if ( !mGeometry )`
`5225`	`5231`	`{`
`5226`	`5232`	`return false;`