From de924ca75956b9b3a713eb60b215d6bcd3851dbf Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 15 Oct 2001 15:50:55 +0000 Subject: [PATCH] Fixes for compilation under IRIX, submitted by Randal Hopper, with mods from Robert. --- include/osg/FrameStamp | 5 +++++ include/osg/Timer | 2 +- src/Demos/hangglide/ReaderWriterFLY.cpp | 2 +- src/Demos/osgconv/OrientationConverter.cpp | 2 +- src/Demos/sgv/sgv.cpp | 6 +++--- src/osg/Matrix.cpp | 8 +++----- src/osgPlugins/bmp/ReaderWriterBMP.cpp | 2 +- src/osgPlugins/dw/ReaderWriterDW.cpp | 2 +- src/osgPlugins/png/new_ReaderWriterPNG.cpp | 2 +- src/osgPlugins/png/prev_ReaderWriterPNG.cpp | 2 +- 10 files changed, 18 insertions(+), 15 deletions(-) diff --git a/include/osg/FrameStamp b/include/osg/FrameStamp index be3d3195b..73c45e79a 100644 --- a/include/osg/FrameStamp +++ b/include/osg/FrameStamp @@ -7,7 +7,12 @@ #include +#ifdef __sgi +#include +#else #include +using std::tm; +#endif namespace osg { diff --git a/include/osg/Timer b/include/osg/Timer index a3ac37495..6b81741cc 100644 --- a/include/osg/Timer +++ b/include/osg/Timer @@ -132,7 +132,7 @@ namespace osg{ } else { - return *_sgiClockAddress; + return *_clockAddress; } } }; diff --git a/src/Demos/hangglide/ReaderWriterFLY.cpp b/src/Demos/hangglide/ReaderWriterFLY.cpp index 244baf26a..3821ccee7 100644 --- a/src/Demos/hangglide/ReaderWriterFLY.cpp +++ b/src/Demos/hangglide/ReaderWriterFLY.cpp @@ -50,7 +50,7 @@ class ReaderWriterFLY : public osgDB::ReaderWriter return osgDB::equalCaseInsensitive(extension,"fly"); } - virtual Node* readNode(const std::string& fileName) + virtual Node* readNode(const std::string& fileName,const osgDB::ReaderWriter::Options*) { std::string ext = osgDB::getFileExtension(fileName); diff --git a/src/Demos/osgconv/OrientationConverter.cpp b/src/Demos/osgconv/OrientationConverter.cpp index b3d3b2b8f..87d6b6f8c 100644 --- a/src/Demos/osgconv/OrientationConverter.cpp +++ b/src/Demos/osgconv/OrientationConverter.cpp @@ -12,7 +12,7 @@ class TransformFunctor : public osg::Drawable::AttributeFunctor osg::Matrix _im; TransformFunctor(const osg::Matrix& m): - AttributeFunctor(osg::Drawable::COORDS|osg::Drawable::NORMALS) + osg::Drawable::AttributeFunctor(osg::Drawable::COORDS|osg::Drawable::NORMALS) { _m = m; _im.invert(_m); diff --git a/src/Demos/sgv/sgv.cpp b/src/Demos/sgv/sgv.cpp index 4fbc081e9..b35c28dba 100644 --- a/src/Demos/sgv/sgv.cpp +++ b/src/Demos/sgv/sgv.cpp @@ -29,7 +29,7 @@ class TransformFunctor : public osg::Drawable::AttributeFunctor osg::Matrix _im; TransformFunctor(const osg::Matrix& m): - AttributeFunctor(osg::Drawable::COORDS|osg::Drawable::NORMALS) + osg::Drawable::AttributeFunctor(osg::Drawable::COORDS|osg::Drawable::NORMALS) { _m = m; _im.invert(_m); @@ -74,7 +74,7 @@ class FlattenStaticTransformsVisitor : public osg::NodeVisitor typedef std::set TransformList; TransformList _transformList; - FlattenStaticTransformsVisitor():NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {} + FlattenStaticTransformsVisitor():osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {} virtual void apply(osg::Geode& geode) { @@ -147,7 +147,7 @@ class RemoveRedundentNodesVisitor : public osg::NodeVisitor typedef std::set NodeList; NodeList _redundentNodeList; - RemoveRedundentNodesVisitor():NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {} + RemoveRedundentNodesVisitor():osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {} virtual void apply(osg::Group& group) { diff --git a/src/osg/Matrix.cpp b/src/osg/Matrix.cpp index 6297364e6..4eba808aa 100644 --- a/src/osg/Matrix.cpp +++ b/src/osg/Matrix.cpp @@ -2,9 +2,7 @@ #include #include #include - -#include //memcpy -#include //acos +#include #include @@ -52,10 +50,10 @@ Matrix::Matrix() : Object(), fully_realized(false) {} Matrix::Matrix( const Matrix& other ) : Object() { - set( (float const * const) other._mat ); + set( (const float *) other._mat ); } -Matrix::Matrix( float const * const def ) +Matrix::Matrix( const float * def ) { set( def ); } diff --git a/src/osgPlugins/bmp/ReaderWriterBMP.cpp b/src/osgPlugins/bmp/ReaderWriterBMP.cpp index 78b522b02..b65a9e316 100644 --- a/src/osgPlugins/bmp/ReaderWriterBMP.cpp +++ b/src/osgPlugins/bmp/ReaderWriterBMP.cpp @@ -186,7 +186,7 @@ int *numComponents_ret) inf.height=ht; inf.planes=npln; inf.Colorbits=cbits; - inf.ColorUsed=pow(2,inf.Colorbits); // infer the colours + inf.ColorUsed=pow(2.0,inf.Colorbits); // infer the colours } long size = hd.siz[1]*65536+hd.siz[0]; int ncpal=4; // default number of colours per palette entry diff --git a/src/osgPlugins/dw/ReaderWriterDW.cpp b/src/osgPlugins/dw/ReaderWriterDW.cpp index 7e1b06dc4..463c91b53 100644 --- a/src/osgPlugins/dw/ReaderWriterDW.cpp +++ b/src/osgPlugins/dw/ReaderWriterDW.cpp @@ -879,7 +879,7 @@ class ReaderWriterDW : public osgDB::ReaderWriter return osgDB::equalCaseInsensitive(extension,"dw"); } - virtual Node* readNode(const std::string& fileName) + virtual Node* readNode(const std::string& fileName,const osgDB::ReaderWriter::Options*) { _dwobj obj; enum reading {NONE, MATERIAL, OBJECT}; diff --git a/src/osgPlugins/png/new_ReaderWriterPNG.cpp b/src/osgPlugins/png/new_ReaderWriterPNG.cpp index 42e9c4846..5f1c1b33d 100644 --- a/src/osgPlugins/png/new_ReaderWriterPNG.cpp +++ b/src/osgPlugins/png/new_ReaderWriterPNG.cpp @@ -286,7 +286,7 @@ class ReaderWriterPNG : public osgDB::ReaderWriter return osgDB::equalCaseInsensitive(extension,"png"); } - virtual osg::Image* readImage(const std::string& fileName) + virtual osg::Image* readImage(const std::string& fileName,const osgDB::ReaderWriter::Options*) { unsigned char *imageData = NULL; diff --git a/src/osgPlugins/png/prev_ReaderWriterPNG.cpp b/src/osgPlugins/png/prev_ReaderWriterPNG.cpp index 03ee1da1e..9440ff044 100644 --- a/src/osgPlugins/png/prev_ReaderWriterPNG.cpp +++ b/src/osgPlugins/png/prev_ReaderWriterPNG.cpp @@ -32,7 +32,7 @@ class ReaderWriterPNG : public osgDB::ReaderWriter virtual const char* className() { return "PNG Image Reader/Writer"; } virtual bool acceptsExtension(const std::string& extension) { return extension=="png"; } - virtual Image* readImage(const std::string& fileName) + virtual Image* readImage(const std::string& fileName,const osgDB::ReaderWriter::Options*) { int trans = PNG_ALPHA;