v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# poly2tri: add missing <stdexcept> 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1117 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/head
aramis_acg 2012-01-17 01:37:46 +00:00
parent 56eb2dd7ee
commit 850285b56e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/poly2tri/poly2tri/common/shapes.h
View File

@ -35,6 +35,7 @@
#include <vector> #include <vector>
#include <cstddef> #include <cstddef>
#include <stdexcept>
#include <assert.h> #include <assert.h>
#include <cmath> #include <cmath>

14
contrib/poly2tri_patch.txt
View File

@ -1,7 +1,15 @@
diff -r 5de9623d6a50 poly2tri/common/shapes.h diff -r 5de9623d6a50 poly2tri/common/shapes.h
--- a/poly2tri/common/shapes.h Mon Aug 08 22:26:41 2011 -0400 --- a/poly2tri/common/shapes.h Mon Aug 08 22:26:41 2011 -0400
+++ b/poly2tri/common/shapes.h Tue Jan 17 02:14:32 2012 +0100 +++ b/poly2tri/common/shapes.h Tue Jan 17 02:36:52 2012 +0100
@@ -136,7 +136,9 @@ @@ -35,6 +35,7 @@
#include <vector>
#include <cstddef>
+#include <stdexcept>
#include <assert.h>
#include <cmath>
@@ -136,7 +137,9 @@
p = &p2; p = &p2;
} else if (p1.x == p2.x) { } else if (p1.x == p2.x) {
// Repeat points // Repeat points
@ -14,7 +22,7 @@ diff -r 5de9623d6a50 poly2tri/common/shapes.h
diff -r 5de9623d6a50 poly2tri/sweep/sweep.cc diff -r 5de9623d6a50 poly2tri/sweep/sweep.cc
--- a/poly2tri/sweep/sweep.cc Mon Aug 08 22:26:41 2011 -0400 --- a/poly2tri/sweep/sweep.cc Mon Aug 08 22:26:41 2011 -0400
+++ b/poly2tri/sweep/sweep.cc Tue Jan 17 02:14:32 2012 +0100 +++ b/poly2tri/sweep/sweep.cc Tue Jan 17 02:36:52 2012 +0100
@@ -113,6 +113,8 @@ @@ -113,6 +113,8 @@
Point* p1 = triangle->PointCCW(point); Point* p1 = triangle->PointCCW(point);
Orientation o1 = Orient2d(eq, *p1, ep); Orientation o1 = Orient2d(eq, *p1, ep);