From e79feb100453d4aa2edbdbcb753af9622892699e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 26 Oct 2004 18:20:52 +0000 Subject: [PATCH] Removed GDAL reference --- examples/osgarchive/GNUmakefile | 2 +- examples/osgarchive/GNUmakefile.inst | 2 +- examples/osgarchive/osgarchive.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/osgarchive/GNUmakefile b/examples/osgarchive/GNUmakefile index b189eedd1..9b44b6ec0 100644 --- a/examples/osgarchive/GNUmakefile +++ b/examples/osgarchive/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgarchive.cpp\ -LIBS += -losgProducer -lProducer -losgDB -losgUtil -losg $(GDAL_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgarchive/GNUmakefile.inst b/examples/osgarchive/GNUmakefile.inst index 41953e5c5..8ede65f70 100644 --- a/examples/osgarchive/GNUmakefile.inst +++ b/examples/osgarchive/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgarchive.cpp\ -LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(X_LIBS) $(OTHER_LIBS) EXEC = osgarchive diff --git a/examples/osgarchive/osgarchive.cpp b/examples/osgarchive/osgarchive.cpp index 0fdef8bbf..92ec00de8 100644 --- a/examples/osgarchive/osgarchive.cpp +++ b/examples/osgarchive/osgarchive.cpp @@ -128,7 +128,8 @@ int main( int argc, char **argv ) itr!=files.end(); ++itr) { - osg::ref_ptr obj = osgDB::readObjectFile(*itr); + osgDB::ReaderWriter::ReadResult result = archive.readObject(*itr); + osg::ref_ptr obj = result.getObject(); if (obj.valid()) { if (obj.valid()) osgDB::writeObjectFile(*obj, *itr);