From 850285b56e67c149812ea829e01d2552262b1e7d Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Tue, 17 Jan 2012 01:37:46 +0000 Subject: [PATCH] # poly2tri: add missing git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1117 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- contrib/poly2tri/poly2tri/common/shapes.h | 1 + contrib/poly2tri_patch.txt | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/contrib/poly2tri/poly2tri/common/shapes.h b/contrib/poly2tri/poly2tri/common/shapes.h index 7c63d09e3..472412154 100644 --- a/contrib/poly2tri/poly2tri/common/shapes.h +++ b/contrib/poly2tri/poly2tri/common/shapes.h @@ -35,6 +35,7 @@ #include #include +#include #include #include diff --git a/contrib/poly2tri_patch.txt b/contrib/poly2tri_patch.txt index f8d38b909..33e621b20 100644 --- a/contrib/poly2tri_patch.txt +++ b/contrib/poly2tri_patch.txt @@ -1,7 +1,15 @@ diff -r 5de9623d6a50 poly2tri/common/shapes.h --- 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 -@@ -136,7 +136,9 @@ ++++ b/poly2tri/common/shapes.h Tue Jan 17 02:36:52 2012 +0100 +@@ -35,6 +35,7 @@ + + #include + #include ++#include + #include + #include + +@@ -136,7 +137,9 @@ p = &p2; } else if (p1.x == p2.x) { // Repeat points @@ -14,7 +22,7 @@ diff -r 5de9623d6a50 poly2tri/common/shapes.h diff -r 5de9623d6a50 poly2tri/sweep/sweep.cc --- 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 @@ Point* p1 = triangle->PointCCW(point); Orientation o1 = Orient2d(eq, *p1, ep);