From e6f6de640a3481ed96af4ce5a40d01c0c195b618 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 25 Jul 2019 12:48:21 +0100
Subject: [PATCH] Added readObject() implementations

---
 src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.h |  6 ++++++
 src/osgPlugins/obj/ReaderWriterOBJ.cpp               | 10 ++--------
 src/osgPlugins/ogr/ReaderWriterOGR.cpp               |  6 ++++++
 src/osgPlugins/txp/ReaderWriterTXP.h                 |  6 ++++++
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.h b/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.h
index dd87c9101..705259820 100644
--- a/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.h
+++ b/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.h
@@ -62,6 +62,12 @@ class ReaderWritterOpenCASCADE: public osgDB::ReaderWriter
         /// \brief returns class name
         virtual const char* className() const { return "STEP/IGES Reader"; }
 
+
+        virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
+        {
+            return readNode(fileName, options);
+        }
+
         virtual osgDB::ReaderWriter::ReadResult readNode(const std::string& fileName, const osgDB::ReaderWriter::Options*) const;
 
         virtual osgDB::ReaderWriter::WriteResult writeNode(const osg::Node&, const std::string&, const Options* =NULL) const ;
diff --git a/src/osgPlugins/obj/ReaderWriterOBJ.cpp b/src/osgPlugins/obj/ReaderWriterOBJ.cpp
index 4868f363c..4830cf823 100644
--- a/src/osgPlugins/obj/ReaderWriterOBJ.cpp
+++ b/src/osgPlugins/obj/ReaderWriterOBJ.cpp
@@ -82,18 +82,12 @@ public:
 
     virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
     {
-        ReadResult result = readNode(fileName, options);
-        osg::Node* node = result.getNode();
-        if (node) return node;
-        else return result;
+        return readNode(fileName, options);
     }
 
     virtual ReadResult readObject(std::istream& fin, const Options* options) const
     {
-        ReadResult result = readNode(fin, options);
-        osg::Node* node = result.getNode();
-        if (node) return node;
-        else return result;
+        return readNode(fin, options);
     }
 
     virtual ReadResult readNode(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const;
diff --git a/src/osgPlugins/ogr/ReaderWriterOGR.cpp b/src/osgPlugins/ogr/ReaderWriterOGR.cpp
index 907ae3bd3..33a48375e 100644
--- a/src/osgPlugins/ogr/ReaderWriterOGR.cpp
+++ b/src/osgPlugins/ogr/ReaderWriterOGR.cpp
@@ -114,6 +114,12 @@ public:
 
     virtual const char* className() const { return "OGR file reader"; }
 
+
+    virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
+    {
+        return readNode(fileName, options);
+    }
+
     virtual ReadResult readNode(const std::string& file, const osgDB::ReaderWriter::Options* options) const
     {
         OSG_INFO<<"OGR::readNode("<<file<<")"<<std::endl;
diff --git a/src/osgPlugins/txp/ReaderWriterTXP.h b/src/osgPlugins/txp/ReaderWriterTXP.h
index 46975aa43..406e9a2ef 100644
--- a/src/osgPlugins/txp/ReaderWriterTXP.h
+++ b/src/osgPlugins/txp/ReaderWriterTXP.h
@@ -64,6 +64,12 @@ public:
         return "TXP Reader/Writer";
     }
 
+
+    virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
+    {
+        return readNode(fileName, options);
+    }
+
     virtual ReadResult readNode(const std::string& file, const osgDB::ReaderWriter::Options* options) const
     {
         if( !acceptsExtension(osgDB::getFileExtension(file) ))