diff --git a/code/IFCUtil.cpp b/code/IFCUtil.cpp index 9781660bb..e2ba99fe9 100644 --- a/code/IFCUtil.cpp +++ b/code/IFCUtil.cpp @@ -257,24 +257,24 @@ IfcFloat ConvertSIPrefix(const std::string& prefix) } // ------------------------------------------------------------------------------------------------ -void ConvertColor(IfcColor4& out, const IfcColourRgb& in) +void ConvertColor(aiColor4D& out, const IfcColourRgb& in) { - out.r = in.Red; - out.g = in.Green; - out.b = in.Blue; - out.a = 1.f; + out.r = static_cast( in.Red ); + out.g = static_cast( in.Green ); + out.b = static_cast( in.Blue ); + out.a = static_cast( 1.f ); } // ------------------------------------------------------------------------------------------------ -void ConvertColor(IfcColor4& out, const IfcColourOrFactor& in,ConversionData& conv,const IfcColor4* base) +void ConvertColor(aiColor4D& out, const IfcColourOrFactor& in,ConversionData& conv,const aiColor4D* base) { if (const EXPRESS::REAL* const r = in.ToPtr()) { out.r = out.g = out.b = *r; if(base) { - out.r *= base->r; - out.g *= base->g; - out.b *= base->b; - out.a = base->a; + out.r *= static_cast( base->r ); + out.g *= static_cast( base->g ); + out.b *= static_cast( base->b ); + out.a = static_cast( base->a ); } else out.a = 1.0; } diff --git a/code/IFCUtil.h b/code/IFCUtil.h index 2a00e3378..14114f139 100644 --- a/code/IFCUtil.h +++ b/code/IFCUtil.h @@ -176,8 +176,8 @@ struct TempMesh // conversion routines for common IFC entities, implemented in IFCUtil.cpp -void ConvertColor(IfcColor4& out, const IfcColourRgb& in); -void ConvertColor(IfcColor4& out, const IfcColourOrFactor& in,ConversionData& conv,const IfcColor4* base); +void ConvertColor(aiColor4D& out, const IfcColourRgb& in); +void ConvertColor(aiColor4D& out, const IfcColourOrFactor& in,ConversionData& conv,const aiColor4D* base); void ConvertCartesianPoint(IfcVector3& out, const IfcCartesianPoint& in); void ConvertDirection(IfcVector3& out, const IfcDirection& in); void ConvertVector(IfcVector3& out, const IfcVector& in);