diff options
Diffstat (limited to 'dep')
| -rw-r--r-- | dep/g3dlite/G3D-v8.0_hotfix7.diff | 13 | ||||
| -rw-r--r-- | dep/g3dlite/G3D-v8.0_hotfix8.diff | 13 | ||||
| -rw-r--r-- | dep/g3dlite/Readme.txt | 3 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/Vector3int32.h | 2 | ||||
| -rw-r--r-- | dep/g3dlite/source/Matrix4.cpp | 2 |
5 files changed, 31 insertions, 2 deletions
diff --git a/dep/g3dlite/G3D-v8.0_hotfix7.diff b/dep/g3dlite/G3D-v8.0_hotfix7.diff new file mode 100644 index 00000000000..00ab78f5c7c --- /dev/null +++ b/dep/g3dlite/G3D-v8.0_hotfix7.diff @@ -0,0 +1,13 @@ +diff --git a/dep/g3dlite/source/Matrix4.cpp b/dep/g3dlite/source/Matrix4.cpp +index 2ce14f6..fbc918f 100644 +--- a/dep/g3dlite/source/Matrix4.cpp ++++ b/dep/g3dlite/source/Matrix4.cpp +@@ -382,7 +382,7 @@ bool Matrix4::operator==(const Matrix4& 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(Matrix4) == 0)) { ++ if (memcmp(this, &other, sizeof(Matrix4)) == 0) { + return true; + } + diff --git a/dep/g3dlite/G3D-v8.0_hotfix8.diff b/dep/g3dlite/G3D-v8.0_hotfix8.diff new file mode 100644 index 00000000000..438fd95f77c --- /dev/null +++ b/dep/g3dlite/G3D-v8.0_hotfix8.diff @@ -0,0 +1,13 @@ +diff --git a/dep/g3dlite/include/G3D/Vector3int32.h b/dep/g3dlite/include/G3D/Vector3int32.h +index 2f256ea..c1a6b21 100644 +--- a/dep/g3dlite/include/G3D/Vector3int32.h ++++ b/dep/g3dlite/include/G3D/Vector3int32.h +@@ -74,7 +74,7 @@ public: + inline Vector3int32& operator+=(const Vector3int32& other) { + x += other.x; + y += other.y; +- z += other.y; ++ z += other.z; + return *this; + } + diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt index 055574ee654..7988d1f314e 100644 --- a/dep/g3dlite/Readme.txt +++ b/dep/g3dlite/Readme.txt @@ -6,3 +6,6 @@ G3D-v8.0_hotfix2.diff - 2012-01-14 - fix typo in isNaN(float x) G3D-v8.0_hotfix3.diff - 2012-08-26 - fix compilation on Fedora Linux G3D-v8.0_hotfix4.diff - 2012-11-09 - fix compilation on OSX G3D-v8.0_hotfix5.diff - 2013-02-27 - fix compilation in cygwin environments +G3D-v8.0_hotfix6.diff - 2013-03-08 - fix compilation in mingw +G3D-v8.0_hotfix7.diff - 2013-08-31 - fix typo in Matrix4 == operator +G3D-v8.0_hotfix8.diff - 2013-09-01 - fix typo in Vector3int32 += operator diff --git a/dep/g3dlite/include/G3D/Vector3int32.h b/dep/g3dlite/include/G3D/Vector3int32.h index 2f256ea0300..c1a6b21e100 100644 --- a/dep/g3dlite/include/G3D/Vector3int32.h +++ b/dep/g3dlite/include/G3D/Vector3int32.h @@ -74,7 +74,7 @@ public: inline Vector3int32& operator+=(const Vector3int32& other) { x += other.x; y += other.y; - z += other.y; + z += other.z; return *this; } diff --git a/dep/g3dlite/source/Matrix4.cpp b/dep/g3dlite/source/Matrix4.cpp index 2ce14f6c5d4..fbc918f8f3e 100644 --- a/dep/g3dlite/source/Matrix4.cpp +++ b/dep/g3dlite/source/Matrix4.cpp @@ -382,7 +382,7 @@ bool Matrix4::operator==(const Matrix4& 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(Matrix4) == 0)) { + if (memcmp(this, &other, sizeof(Matrix4)) == 0) { return true; } |