From 46c46fba78219fa77f93a9bd90f0a3727bac8a0d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 23 Nov 2004 23:47:25 +0000 Subject: [PATCH] Fixed VS.NET warnings --- src/osgDB/Registry.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index 8cf09c7c5..f45a73816 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -1374,7 +1374,7 @@ ReaderWriter::ReadResult Registry::openArchiveImplementation(const std::string& ReaderWriter::ReadResult Registry::readObjectImplementation(const std::string& fileName,const ReaderWriter::Options* options) { return readImplementation(ReadObjectFunctor(fileName, options), - options ? (options->getObjectCacheHint()&ReaderWriter::Options::CACHE_OBJECTS): false); + options ? (options->getObjectCacheHint()&ReaderWriter::Options::CACHE_OBJECTS)!=0: false); } ReaderWriter::WriteResult Registry::writeObjectImplementation(const Object& obj,const std::string& fileName) @@ -1417,7 +1417,7 @@ ReaderWriter::WriteResult Registry::writeObjectImplementation(const Object& obj, ReaderWriter::ReadResult Registry::readImageImplementation(const std::string& fileName,const ReaderWriter::Options* options) { return readImplementation(ReadImageFunctor(fileName, options), - options ? (options->getObjectCacheHint()&ReaderWriter::Options::CACHE_IMAGES): false); + options ? (options->getObjectCacheHint()&ReaderWriter::Options::CACHE_IMAGES)!=0: false); } ReaderWriter::WriteResult Registry::writeImageImplementation(const Image& image,const std::string& fileName) @@ -1459,7 +1459,7 @@ ReaderWriter::WriteResult Registry::writeImageImplementation(const Image& image, ReaderWriter::ReadResult Registry::readHeightFieldImplementation(const std::string& fileName,const ReaderWriter::Options* options) { return readImplementation(ReadHeightFieldFunctor(fileName, options), - options ? (options->getObjectCacheHint()&ReaderWriter::Options::CACHE_HEIGHTFIELDS): false); + options ? (options->getObjectCacheHint()&ReaderWriter::Options::CACHE_HEIGHTFIELDS)!=0: false); } ReaderWriter::WriteResult Registry::writeHeightFieldImplementation(const HeightField& HeightField,const std::string& fileName) @@ -1501,7 +1501,7 @@ ReaderWriter::WriteResult Registry::writeHeightFieldImplementation(const HeightF ReaderWriter::ReadResult Registry::readNodeImplementation(const std::string& fileName,const ReaderWriter::Options* options) { return readImplementation(ReadNodeFunctor(fileName, options), - options ? (options->getObjectCacheHint()&ReaderWriter::Options::CACHE_NODES): false); + options ? (options->getObjectCacheHint()&ReaderWriter::Options::CACHE_NODES)!=0: false); } ReaderWriter::WriteResult Registry::writeNodeImplementation(const Node& node,const std::string& fileName)