Dep/G3D: Backport fix from G3D10

(cherry picked from commit b9d5b194df)
This commit is contained in:
jackpoz
2015-07-02 22:05:36 +02:00
committed by DDuarte
parent 08f11ed515
commit e98b8fa7c5
3 changed files with 18 additions and 1 deletions

View File

@@ -0,0 +1,16 @@
dep/g3dlite/source/Matrix4.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dep/g3dlite/source/Matrix4.cpp b/dep/g3dlite/source/Matrix4.cpp
index f3b25ad..0588cb6 100644
--- a/dep/g3dlite/source/Matrix4.cpp
+++ b/dep/g3dlite/source/Matrix4.cpp
@@ -606,7 +606,7 @@ bool Matrix4float64::operator==(const Matrix4float64& other) const {
// If the bit patterns are identical, they must be
// the same matrix. If not, they *might* still have
// equal elements due to floating point weirdness.
- if (memcmp(this, &other, sizeof(Matrix4float64) == 0)) {
+ if (memcmp(this, &other, sizeof(Matrix4float64)) == 0) {
return true;
}

View File

@@ -13,3 +13,4 @@ G3D-v8.0_hotfix9.diff - 2014-06-01 - only VS < 10 don't ship inttypes.h
G3D-v9.0 hotfix1.diff - 2014-08-22 - updated to G3D9, reapplied previous patches and removed unneeded changes
G3D-v9.0 hotfix2.diff - 2014-08-23 - fix some -Wconversion warnings
G3D-v9.0 hotfix3.diff - 2015-06-28 - fix some warnings
G3D-v9.0 hotfix4.diff - 2015-07-02 - backport G3D10 fix

View File

@@ -606,7 +606,7 @@ bool Matrix4float64::operator==(const Matrix4float64& other) const {
// If the bit patterns are identical, they must be
// the same matrix. If not, they *might* still have
// equal elements due to floating point weirdness.
if (memcmp(this, &other, sizeof(Matrix4float64) == 0)) {
if (memcmp(this, &other, sizeof(Matrix4float64)) == 0) {
return true;
}