From e88f6ef22775a2c38ae7691295459778a7664d77 Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Mon, 3 Dec 2012 12:00:36 +0000 Subject: [PATCH 1/2] - copy&paste error in aiColor3D::operator- apparently nobody's using these. Thanks to Robin Tucker for pointing this out git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1342 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- include/assimp/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/types.h b/include/assimp/types.h index 3afb66ef8..592a128f2 100644 --- a/include/assimp/types.h +++ b/include/assimp/types.h @@ -178,7 +178,7 @@ struct aiColor3D /** Component-wise subtraction */ aiColor3D operator-(const aiColor3D& c) const { - return aiColor3D(r+c.r,g+c.g,b+c.b); + return aiColor3D(r-c.r,g-c.g,b-c.b); } /** Component-wise multiplication */ From ac7d7d20c94f04b78241db07f2ffcf13c9e4650f Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Tue, 4 Dec 2012 07:42:15 +0000 Subject: [PATCH 2/2] - fixed compilation error on GCC in IFC loader. Thanks to larsp for the report! git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1343 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/IFCUtil.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/IFCUtil.cpp b/code/IFCUtil.cpp index 96877f934..17149906f 100644 --- a/code/IFCUtil.cpp +++ b/code/IFCUtil.cpp @@ -142,8 +142,8 @@ void TempMesh::RemoveDegenerates() bool drop = false; size_t inor = 0; - std::vector::const_iterator vit = verts.begin(); - for (std::vector::const_iterator it = vertcnt.begin(); it != vertcnt.end(); ++inor) { + std::vector::iterator vit = verts.begin(); + for (std::vector::iterator it = vertcnt.begin(); it != vertcnt.end(); ++inor) { const unsigned int pcount = *it; if (normals[inor].SquareLength() < 1e-5f) {