From af87633c9f3cb54b6a488b3acab962759f3a5497 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Sun, 8 Feb 2009 23:19:11 +0000 Subject: [PATCH] Fixes to make gcc happy. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@339 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/ColladaLoader.cpp | 2 +- code/ColladaParser.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index 7ac18c415..07833f3a4 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -425,7 +425,7 @@ void ColladaLoader::BuildMeshesForNode( const ColladaParser& pParser, const Coll table = NULL; DefaultLogger::get()->warn( boost::str( boost::format( "Collada: No material specified for subgroup \"%s\" in geometry \"%s\".") % submesh.mMaterial % mid.mMesh)); } - std::string& meshMaterial = table ? table->mMatName : ""; + const std::string& meshMaterial = table ? table->mMatName : ""; // OK ... here the *real* fun starts ... we have the vertex-input-to-effect-semantic-table // given. The only mapping stuff which we do actually support is the UV channel. diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp index 3ecb45796..5c084abef 100644 --- a/code/ColladaParser.cpp +++ b/code/ColladaParser.cpp @@ -420,13 +420,13 @@ void ColladaParser::ReadLight( Collada::Light& pLight) // text content contains 3 floats const char* content = GetTextContent(); - content = fast_atof_move( content, pLight.mColor.r); + content = fast_atof_move( content, (float&)pLight.mColor.r); SkipSpacesAndLineEnd( &content); - content = fast_atof_move( content, pLight.mColor.g); + content = fast_atof_move( content, (float&)pLight.mColor.g); SkipSpacesAndLineEnd( &content); - content = fast_atof_move( content, pLight.mColor.b); + content = fast_atof_move( content, (float&)pLight.mColor.b); SkipSpacesAndLineEnd( &content); TestClosing( "color"); @@ -754,16 +754,16 @@ void ColladaParser::ReadEffectColor( aiColor4D& pColor, Sampler& pSampler) // text content contains 4 floats const char* content = GetTextContent(); - content = fast_atof_move( content, pColor.r); + content = fast_atof_move( content, (float&)pColor.r); SkipSpacesAndLineEnd( &content); - content = fast_atof_move( content, pColor.g); + content = fast_atof_move( content, (float&)pColor.g); SkipSpacesAndLineEnd( &content); - content = fast_atof_move( content, pColor.b); + content = fast_atof_move( content, (float&)pColor.b); SkipSpacesAndLineEnd( &content); - content = fast_atof_move( content, pColor.a); + content = fast_atof_move( content, (float&)pColor.a); SkipSpacesAndLineEnd( &content); TestClosing( "color"); }