From 428608e7816b9ab17afd411deb9039631e704e91 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 16 May 2005 15:51:57 +0000 Subject: [PATCH] Warning fixes for IRIX --- src/osg/dxtctool.cpp | 26 +++++++------- src/osg/dxtctool.h | 60 ++++++++++++++++---------------- src/osgFX/SpecularHighlights.cpp | 2 +- src/osgGA/UFOManipulator.cpp | 1 - src/osgSim/SphereSegment.cpp | 40 ++++++--------------- 5 files changed, 54 insertions(+), 75 deletions(-) diff --git a/src/osg/dxtctool.cpp b/src/osg/dxtctool.cpp index 0a79462b0..9bac81ebc 100644 --- a/src/osg/dxtctool.cpp +++ b/src/osg/dxtctool.cpp @@ -78,7 +78,7 @@ bool dxtc_pixels::VFlip() const void dxtc_pixels::VFlip_DXT1() const { // const size_t Size = ((m_Width + 3) / 4) * ((m_Height + 3) / 4) * BSIZE_DXT1; - dxtc_int8 * const pPixels = (dxtc_int8 * const) m_pPixels; + dxtc_int8 * pPixels = (dxtc_int8 * ) m_pPixels; if (m_Height == 2) for (size_t j = 0; j < (m_Width + 3) / 4; ++j) @@ -105,14 +105,14 @@ void dxtc_pixels::VFlip_DXT3() const if (m_Height == 2) for (size_t j = 0; j < (m_Width + 3) / 4; ++j) { - BVF_Alpha_DXT3_H2(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT3)); - BVF_Color_H2(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3)); + BVF_Alpha_DXT3_H2(((dxtc_int8 * ) m_pPixels) + (j * BSIZE_DXT3)); + BVF_Color_H2(((dxtc_int8 * ) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3)); } if (m_Height == 4) for (size_t j = 0; j < (m_Width + 3) / 4; ++j) { - BVF_Alpha_DXT3_H4(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT3)); - BVF_Color_H4(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3)); + BVF_Alpha_DXT3_H4(((dxtc_int8 * ) m_pPixels) + (j * BSIZE_DXT3)); + BVF_Color_H4(((dxtc_int8 * ) m_pPixels) + (j * BSIZE_DXT3 + BSIZE_ALPHA_DXT3)); } if (m_Height > 4) @@ -120,8 +120,8 @@ void dxtc_pixels::VFlip_DXT3() const for (size_t j = 0; j < (m_Width + 3) / 4; ++j) { const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1); BVF_Alpha_DXT3(GetBlock(i, j, BSIZE_DXT3), GetBlock(TargetRow, j, BSIZE_DXT3)); - BVF_Color(((dxtc_int8 * const) GetBlock(i, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3, - ((dxtc_int8 * const) GetBlock(TargetRow, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3); + BVF_Color(((dxtc_int8 * ) GetBlock(i, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3, + ((dxtc_int8 * ) GetBlock(TargetRow, j, BSIZE_DXT3)) + BSIZE_ALPHA_DXT3); } } @@ -134,14 +134,14 @@ void dxtc_pixels::VFlip_DXT5() const if (m_Height == 2) for (size_t j = 0; j < (m_Width + 3) / 4; ++j) { - BVF_Alpha_DXT5_H2(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT5)); - BVF_Color_H2(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5)); + BVF_Alpha_DXT5_H2(((dxtc_int8 * ) m_pPixels) + (j * BSIZE_DXT5)); + BVF_Color_H2(((dxtc_int8 * ) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5)); } if (m_Height == 4) for (size_t j = 0; j < (m_Width + 3) / 4; ++j) { - BVF_Alpha_DXT5_H4(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT5)); - BVF_Color_H4(((dxtc_int8 * const) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5)); + BVF_Alpha_DXT5_H4(((dxtc_int8 * ) m_pPixels) + (j * BSIZE_DXT5)); + BVF_Color_H4(((dxtc_int8 * ) m_pPixels) + (j * BSIZE_DXT5 + BSIZE_ALPHA_DXT5)); } if (m_Height > 4) @@ -149,8 +149,8 @@ void dxtc_pixels::VFlip_DXT5() const for (size_t j = 0; j < (m_Width + 3) / 4; ++j) { const size_t TargetRow = ((m_Height + 3) / 4) - (i + 1); BVF_Alpha_DXT5(GetBlock(i, j, BSIZE_DXT5), GetBlock(TargetRow, j, BSIZE_DXT5)); - BVF_Color(((dxtc_int8 * const) GetBlock(i, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5, - ((dxtc_int8 * const) GetBlock(TargetRow, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5); + BVF_Color(((dxtc_int8 * ) GetBlock(i, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5, + ((dxtc_int8 * ) GetBlock(TargetRow, j, BSIZE_DXT5)) + BSIZE_ALPHA_DXT5); } } diff --git a/src/osg/dxtctool.h b/src/osg/dxtctool.h index aea6cae12..3c8a48169 100644 --- a/src/osg/dxtctool.h +++ b/src/osg/dxtctool.h @@ -85,7 +85,7 @@ bool VerticalFlip(size_t Width, size_t Height, GLenum Format, void * pPixels); class dxtc_pixels { public: - dxtc_pixels(size_t Width, size_t Height, GLenum Format, void * pPixels); + inline dxtc_pixels(size_t Width, size_t Height, GLenum Format, void * pPixels); // Vertically flip the whole picture bool VFlip() const; @@ -93,11 +93,11 @@ public: protected: // Limitation check functions - bool DXT1() const; - bool DXT3() const; - bool DXT5() const; - bool OpenGLSize() const; - bool SupportedFormat() const; + inline bool DXT1() const; + inline bool DXT3() const; + inline bool DXT5() const; + inline bool OpenGLSize() const; + inline bool SupportedFormat() const; // Vertical flipping functions void VFlip_DXT1() const; @@ -105,18 +105,18 @@ protected: void VFlip_DXT5() const; // Block vertical flipping functions - void BVF_Color_H2(void * const pBlock) const; // V. flip one color block with its virtual height == 2 - void BVF_Color_H4(void * const pBlock) const; // V. flip one color block with its virtual height == 4 - void BVF_Color(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two color blocks, with their virtual height == 4 - void BVF_Alpha_DXT3_H2(void * const pBlock) const; // V. flip one alpha (DXT3) block with its virtual height == 2 - void BVF_Alpha_DXT3_H4(void * const pBlock) const; // V. flip one alpha (DXT3) block with its virtual height == 4 - void BVF_Alpha_DXT3(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two alpha (DXT3) blocks, with their virtual height == 4 - void BVF_Alpha_DXT5_H2(void * const pBlock) const; // V. flip one alpha (DXT5) block with its virtual height == 2 - void BVF_Alpha_DXT5_H4(void * const pBlock) const; // V. flip one alpha (DXT5) block with its virtual height == 4 - void BVF_Alpha_DXT5(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two alpha (DXT5) blocks, with their virtual height == 4 + inline void BVF_Color_H2(void * const pBlock) const; // V. flip one color block with its virtual height == 2 + inline void BVF_Color_H4(void * const pBlock) const; // V. flip one color block with its virtual height == 4 + inline void BVF_Color(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two color blocks, with their virtual height == 4 + inline void BVF_Alpha_DXT3_H2(void * const pBlock) const; // V. flip one alpha (DXT3) block with its virtual height == 2 + inline void BVF_Alpha_DXT3_H4(void * const pBlock) const; // V. flip one alpha (DXT3) block with its virtual height == 4 + inline void BVF_Alpha_DXT3(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two alpha (DXT3) blocks, with their virtual height == 4 + inline void BVF_Alpha_DXT5_H2(void * const pBlock) const; // V. flip one alpha (DXT5) block with its virtual height == 2 + inline void BVF_Alpha_DXT5_H4(void * const pBlock) const; // V. flip one alpha (DXT5) block with its virtual height == 4 + inline void BVF_Alpha_DXT5(void * const pBlock1, void * const pBlock2) const; // V. flip and swap two alpha (DXT5) blocks, with their virtual height == 4 // Block localization functions - void * GetBlock(size_t i, size_t j, size_t BlockSize) const; + inline void * GetBlock(size_t i, size_t j, size_t BlockSize) const; // mighty const and var static const size_t BSIZE_DXT1; @@ -174,7 +174,7 @@ inline bool dxtc_pixels::SupportedFormat() const { inline void dxtc_pixels::BVF_Color_H2(void * const pBlock) const { // Swap the two first row of pixels - dxtc_int8 * const pP = ((dxtc_int8 * const) pBlock) + 4; + dxtc_int8 * pP = ((dxtc_int8 *) pBlock) + 4; std::swap(pP[0], pP[1]); } @@ -182,7 +182,7 @@ inline void dxtc_pixels::BVF_Color_H2(void * const pBlock) const { inline void dxtc_pixels::BVF_Color_H4(void * const pBlock) const { // Swap the the first row of pixels with the last one, then the 2 middle row of pixels - dxtc_int8 * const pP = ((dxtc_int8 * const) pBlock) + 4; + dxtc_int8 * pP = ((dxtc_int8 *) pBlock) + 4; std::swap(pP[0], pP[3]); std::swap(pP[1], pP[2]); @@ -191,14 +191,14 @@ inline void dxtc_pixels::BVF_Color_H4(void * const pBlock) const { inline void dxtc_pixels::BVF_Color(void * const pBlock1, void * const pBlock2) const { // Swap the "2 colors" header (32bits each header) - dxtc_int32 * const pHdr1 = (dxtc_int32 * const) pBlock1; - dxtc_int32 * const pHdr2 = (dxtc_int32 * const) pBlock2; + dxtc_int32 * pHdr1 = (dxtc_int32 * ) pBlock1; + dxtc_int32 * pHdr2 = (dxtc_int32 * ) pBlock2; std::swap(* pHdr1, * pHdr2); // Now swap the pixel values - dxtc_int8 * const pP1 = ((dxtc_int8 * const) pBlock1) + 4; - dxtc_int8 * const pP2 = ((dxtc_int8 * const) pBlock2) + 4; + dxtc_int8 * pP1 = ((dxtc_int8 * ) pBlock1) + 4; + dxtc_int8 * pP2 = ((dxtc_int8 * ) pBlock2) + 4; std::swap(pP1[0], pP2[3]); std::swap(pP1[1], pP2[2]); @@ -209,7 +209,7 @@ inline void dxtc_pixels::BVF_Color(void * const pBlock1, void * const pBlock2) c inline void dxtc_pixels::BVF_Alpha_DXT3_H2(void * const pBlock) const { // Swap the two first row of pixels - dxtc_int16 * const pP = (dxtc_int16 * const) pBlock; + dxtc_int16 * pP = (dxtc_int16 * ) pBlock; std::swap(pP[0], pP[1]); } @@ -217,7 +217,7 @@ inline void dxtc_pixels::BVF_Alpha_DXT3_H2(void * const pBlock) const { inline void dxtc_pixels::BVF_Alpha_DXT3_H4(void * const pBlock) const { // Swap the the first row of pixels with the last one, then the 2 middle row of pixels - dxtc_int16 * const pP = (dxtc_int16 * const) pBlock; + dxtc_int16 * pP = (dxtc_int16 * ) pBlock; std::swap(pP[0], pP[3]); std::swap(pP[1], pP[2]); @@ -226,8 +226,8 @@ inline void dxtc_pixels::BVF_Alpha_DXT3_H4(void * const pBlock) const { inline void dxtc_pixels::BVF_Alpha_DXT3(void * const pBlock1, void * const pBlock2) const { // Swap all the pixel values - dxtc_int16 * const pP1 = (dxtc_int16 * const) pBlock1; - dxtc_int16 * const pP2 = (dxtc_int16 * const) pBlock2; + dxtc_int16 * pP1 = (dxtc_int16 * ) pBlock1; + dxtc_int16 * pP2 = (dxtc_int16 * ) pBlock2; std::swap(pP1[0], pP2[3]); std::swap(pP1[1], pP2[2]); @@ -238,7 +238,7 @@ inline void dxtc_pixels::BVF_Alpha_DXT3(void * const pBlock1, void * const pBloc inline void dxtc_pixels::BVF_Alpha_DXT5_H2(void * const pBlock) const { // Swap the two first row of pixels (kinda tricky with DXT5 unaligned encoding) - dxtc_int32 * const pP = (dxtc_int32 * const) (((dxtc_int8 * const) pBlock) + 2); + dxtc_int32 * pP = (dxtc_int32 * ) (((dxtc_int8 * ) pBlock) + 2); dxtc_int32 TmpDWord = (pP[0] & 0xFF000000); TmpDWord |= (pP[0] & 0x00000FFF) << 12; @@ -253,7 +253,7 @@ inline void dxtc_pixels::BVF_Alpha_DXT5_H2(void * const pBlock) const { inline void dxtc_pixels::BVF_Alpha_DXT5_H4(void * const pBlock) const { // Swap the the first row of pixels with the last one, then the 2 middle row of pixels (tricky again) - dxtc_int64 * const pB = (dxtc_int64 * const) pBlock; + dxtc_int64 * pB = (dxtc_int64 * ) pBlock; dxtc_int64 TmpQWord = (pB[0] & HEX_0x000000000000FFFF); TmpQWord |= (pB[0] & HEX_0x000000000FFF0000) << 36; @@ -266,8 +266,8 @@ inline void dxtc_pixels::BVF_Alpha_DXT5_H4(void * const pBlock) const { inline void dxtc_pixels::BVF_Alpha_DXT5(void * const pBlock1, void * const pBlock2) const { // Swap all the pixel values (same trick for DXT5) - dxtc_int64 * const pB1 = (dxtc_int64 * const) pBlock1; - dxtc_int64 * const pB2 = (dxtc_int64 * const) pBlock2; + dxtc_int64 * pB1 = (dxtc_int64 * ) pBlock1; + dxtc_int64 * pB2 = (dxtc_int64 * ) pBlock2; dxtc_int64 TmpQWord1 = (pB1[0] & HEX_0x000000000000FFFF); TmpQWord1 |= (pB1[0] & HEX_0x000000000FFF0000) << 36; diff --git a/src/osgFX/SpecularHighlights.cpp b/src/osgFX/SpecularHighlights.cpp index b6cd331b6..a054a0592 100644 --- a/src/osgFX/SpecularHighlights.cpp +++ b/src/osgFX/SpecularHighlights.cpp @@ -100,7 +100,7 @@ namespace { } - void getRequiredExtensions(std::vector& extensions) + virtual void getRequiredExtensions(std::vector& extensions) { extensions.push_back("GL_ARB_texture_env_add"); } diff --git a/src/osgGA/UFOManipulator.cpp b/src/osgGA/UFOManipulator.cpp index 57e77c700..daad9702c 100644 --- a/src/osgGA/UFOManipulator.cpp +++ b/src/osgGA/UFOManipulator.cpp @@ -524,7 +524,6 @@ void UFOManipulator::_adjustPosition() if( d < _minDistanceInFront ) { - osg::Vec3 op = _position; _position = ip + (_direction * -_minDistanceInFront); _stop(); } diff --git a/src/osgSim/SphereSegment.cpp b/src/osgSim/SphereSegment.cpp index 8aeaf9e4b..93c7a18e4 100644 --- a/src/osgSim/SphereSegment.cpp +++ b/src/osgSim/SphereSegment.cpp @@ -349,40 +349,24 @@ void SphereSegment::init() addDrawable(new Spoke(this,MAX,MAX)); } -namespace -{ - -struct DirtyDisplayList -{ - void operator()(osg::ref_ptr& dptr) - { - dptr->dirtyDisplayList(); - } -}; - -} - void SphereSegment::dirtyAllDrawableDisplayLists() { - std::for_each(_drawables.begin(), _drawables.end(), DirtyDisplayList()); -} - -namespace -{ - -struct DirtyBound -{ - void operator()(osg::ref_ptr& dptr) + for(DrawableList::iterator itr = _drawables.begin(); + itr != _drawables.end(); + ++itr) { - dptr->dirtyBound(); + (*itr)->dirtyDisplayList(); } -}; - } void SphereSegment::dirtyAllDrawableBounds() { - std::for_each(_drawables.begin(), _drawables.end(), DirtyBound()); + for(DrawableList::iterator itr = _drawables.begin(); + itr != _drawables.end(); + ++itr) + { + (*itr)->dirtyBound(); + } } void SphereSegment::Surface_drawImplementation(osg::State& /* state */) const @@ -898,8 +882,6 @@ void SphereSegment::setDrawMask(DrawMask dm) dirtyBound(); } -namespace{ - struct ActivateTransparencyOnType { ActivateTransparencyOnType(const std::type_info& t): _t(t) {} @@ -939,8 +921,6 @@ struct DeactivateTransparencyOnType const std::type_info& _t; }; -} - void SphereSegment::setSurfaceColor(const osg::Vec4& c) { _surfaceColor=c;