[OGR provider] subLayers(): avoid emitting error on a geometry less layer

rouault · rouault · commit feaa8b812b41 · 2017-10-20T21:46:20.000+02:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -696,9 +696,9 @@ void QgsOgrProvider::addSubLayerDetailsToSubLayerList( int i, QgsOgrLayer *layer
   // Get first column name,
   // TODO: add support for multiple
   QString geometryColumnName;
-  OGRGeomFieldDefnH geomH = fdef.GetGeomFieldDefn( 0 );
-  if ( geomH )
+  if ( fdef.GetGeomFieldCount() )
   {
+    OGRGeomFieldDefnH geomH = fdef.GetGeomFieldDefn( 0 );
     geometryColumnName = QString::fromUtf8( OGR_GFld_GetNameRef( geomH ) );
   }
   QString layerName = QString::fromUtf8( layer->name() );
@@ -4648,6 +4648,12 @@ int QgsOgrFeatureDefn::GetFieldIndex( const QByteArray &name )
   return OGR_FD_GetFieldIndex( get(), name.constData() );
 }
 
+int QgsOgrFeatureDefn::GetGeomFieldCount()
+{
+  QMutexLocker locker( &mutex() );
+  return OGR_FD_GetGeomFieldCount( get() );
+}
+
 OGRGeomFieldDefnH  QgsOgrFeatureDefn::GetGeomFieldDefn( int idx )
 {
   QMutexLocker locker( &mutex() );
diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
@@ -402,6 +402,9 @@ class QgsOgrFeatureDefn
     //! Wrapper of OGR_FD_GetFieldIndex
     int GetFieldIndex( const QByteArray & );
 
+    //! Wrapper of OGR_FD_GetGeomFieldCount
+    int GetGeomFieldCount();
+
     //! Wrapper of OGR_FD_GetGeomFieldDefn
     OGRGeomFieldDefnH GetGeomFieldDefn( int idx );
 

Original file line number	Diff line number	Diff line change
`@@ -696,9 +696,9 @@ void QgsOgrProvider::addSubLayerDetailsToSubLayerList( int i, QgsOgrLayer *layer`
`696`	`696`	`// Get first column name,`
`697`	`697`	`// TODO: add support for multiple`
`698`	`698`	`QString geometryColumnName;`
`699`		`- OGRGeomFieldDefnH geomH = fdef.GetGeomFieldDefn( 0 );`
`700`		`- if ( geomH )`
	`699`	`+ if ( fdef.GetGeomFieldCount() )`
`701`	`700`	`{`
	`701`	`+ OGRGeomFieldDefnH geomH = fdef.GetGeomFieldDefn( 0 );`
`702`	`702`	`geometryColumnName = QString::fromUtf8( OGR_GFld_GetNameRef( geomH ) );`
`703`	`703`	`}`
`704`	`704`	`QString layerName = QString::fromUtf8( layer->name() );`
`@@ -4648,6 +4648,12 @@ int QgsOgrFeatureDefn::GetFieldIndex( const QByteArray &name )`
`4648`	`4648`	`return OGR_FD_GetFieldIndex( get(), name.constData() );`
`4649`	`4649`	`}`
`4650`	`4650`
	`4651`	`+int QgsOgrFeatureDefn::GetGeomFieldCount()`
	`4652`	`+{`
	`4653`	`+ QMutexLocker locker( &mutex() );`
	`4654`	`+ return OGR_FD_GetGeomFieldCount( get() );`
	`4655`	`+}`
	`4656`	`+`
`4651`	`4657`	`OGRGeomFieldDefnH QgsOgrFeatureDefn::GetGeomFieldDefn( int idx )`
`4652`	`4658`	`{`
`4653`	`4659`	`QMutexLocker locker( &mutex() );`