From bfedea56362ab1670f00e2190e2112efc6378d31 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Tue, 8 Oct 2002 08:39:42 +0000 Subject: [PATCH] osgdb_osg loader had more issues with const/non-const discrepancies on Solaris. Modified Geoset.cpp and Point.cpp --- src/osg/GeoSet.cpp | 14 +++++++------- src/osg/Point.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/osg/GeoSet.cpp b/src/osg/GeoSet.cpp index fb5ac45e1..94a6821b4 100644 --- a/src/osg/GeoSet.cpp +++ b/src/osg/GeoSet.cpp @@ -196,7 +196,7 @@ GeoSet::~GeoSet() } -void GeoSet::setColorBinding( const BindingType binding ) +void GeoSet::setColorBinding( BindingType binding ) { if( binding != BIND_DEFAULT && binding != BIND_OFF && @@ -214,7 +214,7 @@ void GeoSet::setColorBinding( const BindingType binding ) } -void GeoSet::setNormalBinding( const BindingType binding ) +void GeoSet::setNormalBinding( BindingType binding ) { if( binding != BIND_DEFAULT && binding != BIND_OFF && @@ -232,7 +232,7 @@ void GeoSet::setNormalBinding( const BindingType binding ) } -void GeoSet::setTextureBinding( const BindingType binding ) +void GeoSet::setTextureBinding( BindingType binding ) { if( binding != BIND_DEFAULT && binding != BIND_OFF && @@ -559,7 +559,7 @@ bool GeoSet::check() const } -void GeoSet::setPrimType( const PrimitiveType type ) +void GeoSet::setPrimType( PrimitiveType type ) { switch( type ) { @@ -769,7 +769,7 @@ void GeoSet::setTextureCoords( Vec2 *cp, IndexPointer& ip ) set_fast_path(); } -void GeoSet::setInterleavedArray( const InterleaveArrayType format, float *pointer ) +void GeoSet::setInterleavedArray( InterleaveArrayType format, float *pointer ) { _iaformat = format; @@ -797,7 +797,7 @@ void GeoSet::setInterleavedArray( const InterleaveArrayType format, float *point } -void GeoSet::setInterleavedArray( const InterleaveArrayType format, float *ia, ushort *iai ) +void GeoSet::setInterleavedArray( InterleaveArrayType format, float *ia, ushort *iai ) { _iaformat = format; @@ -826,7 +826,7 @@ void GeoSet::setInterleavedArray( const InterleaveArrayType format, float *ia, u set_fast_path(); } -void GeoSet::setInterleavedArray( const InterleaveArrayType format, float *ia, IndexPointer& iai ) +void GeoSet::setInterleavedArray( InterleaveArrayType format, float *ia, IndexPointer& iai ) { _iaformat = format; diff --git a/src/osg/Point.cpp b/src/osg/Point.cpp index e14c44d34..ec02c6e8c 100644 --- a/src/osg/Point.cpp +++ b/src/osg/Point.cpp @@ -76,7 +76,7 @@ void Point::setSize( float size ) } -void Point::setFadeThresholdSize(const float fadeThresholdSize) +void Point::setFadeThresholdSize(float fadeThresholdSize) { _fadeThresholdSize = fadeThresholdSize; }