fix #8083 (MultiSurfaces not supported)

qgis · Jun 16, 2013 · 65b0cd9 · 65b0cd9
1 parent 883785c
commit 65b0cd9
Showing 1 changed file with 28 additions and 6 deletions.
diff --git a/src/core/qgsgml.cpp b/src/core/qgsgml.cpp
@@ -379,8 +379,16 @@ void QgsGml::endElement( const XML_Char* el )
       {
         //error
       }
-      mCurrentWKBFragments.begin()->push_back( wkb );
-      mCurrentWKBFragmentSizes.begin()->push_back( wkbSize );
+      if ( !mCurrentWKBFragments.isEmpty() )
+      {
+        mCurrentWKBFragments.begin()->push_back( wkb );
+        mCurrentWKBFragmentSizes.begin()->push_back( wkbSize );
+      }
+      else
+      {
+        QgsDebugMsg( "No wkb fragments" );
+      }
+
       //wkbList.push_back(wkb);
       //wkbSizeList.push_back(wkbSize);
       //mCurrentWKBFragments.push_back(wkbList);
@@ -418,8 +426,15 @@ void QgsGml::endElement( const XML_Char* el )
       {
         //error
       }
-      mCurrentWKBFragments.begin()->push_back( wkb );
-      mCurrentWKBFragmentSizes.begin()->push_back( wkbSize );
+      if ( !mCurrentWKBFragments.isEmpty() )
+      {
+        mCurrentWKBFragments.begin()->push_back( wkb );
+        mCurrentWKBFragmentSizes.begin()->push_back( wkbSize );
+      }
+      else
+      {
+        QgsDebugMsg( "no wkb fragments" );
+      }
       //wkbList.push_back(wkb);
       //wkbSizeList.push_back(wkbSize);
       //mCurrentWKBFragments.push_back(wkbList);
@@ -439,8 +454,15 @@ void QgsGml::endElement( const XML_Char* el )
     {
       //error
     }
-    mCurrentWKBFragments.begin()->push_back( wkb );
-    mCurrentWKBFragmentSizes.begin()->push_back( wkbSize );
+    if ( !mCurrentWKBFragments.isEmpty() )
+    {
+      mCurrentWKBFragments.begin()->push_back( wkb );
+      mCurrentWKBFragmentSizes.begin()->push_back( wkbSize );
+    }
+    else
+    {
+      QgsDebugMsg( "no wkb fragments" );
+    }
   }
   else if ( elementName == GML_NAMESPACE + NS_SEPARATOR + "Polygon" )
   {