Hi Robert
Not sure if you came up with this but since I couldn't see your version of the
patch I recreated it.
...
Thank you!
Cheers,
Tony
------------------
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=64201#64201
--- OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp 2012-03-22
04:36:20.000000000 +1100
+++ ../OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp
2015-06-26 21:53:33.349709134 +1000
@@ -134,11 +134,21 @@
virtual ReadResult readFile(const std::string& fileName, const
osgDB::ReaderWriter::Options* options) const
{
+#if GDAL_VERSION_MAJOR < 2
if (OGRSFDriverRegistrar::GetRegistrar()->GetDriverCount() == 0)
OGRRegisterAll();
+#else
+ if (GDALGetDriverCount() == 0)
+ GDALAllRegister();
+#endif
// Try to open data source
+#if GDAL_VERSION_MAJOR < 2
OGRDataSource* file = OGRSFDriverRegistrar::Open(fileName.c_str());
+#else
+ GDALDataset *file;
+ file = (GDALDataset*) GDALOpenEx( fileName.c_str(), GDAL_OF_VECTOR,
NULL, NULL, NULL );
+#endif
if (!file)
return 0;
@@ -156,6 +166,7 @@
osg::Group* group = new osg::Group;
+#if GDAL_VERSION_MAJOR < 2
for (int i = 0; i < file->GetLayerCount(); i++)
{
osg::Group* node = readLayer(file->GetLayer(i), file->GetName(),
useRandomColorByFeature, addGroupPerFeature);
@@ -163,6 +174,16 @@
group->addChild( node );
}
OGRDataSource::DestroyDataSource( file );
+#else
+ for (int i = 0; i < file->GetLayerCount(); i++)
+ {
+ OGRLayer* layer = (OGRLayer *)GDALDatasetGetLayer(file, i);
+ osg::Group* node = readLayer(layer, layer->GetName(),
useRandomColorByFeature, addGroupPerFeature);
+ if (node)
+ group->addChild( node );
+ }
+ GDALClose( file );
+#endif
return group;
}
_______________________________________________
osg-users mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
