From 682983901f67855e3696d8ba66868379635c219a Mon Sep 17 00:00:00 2001 From: Gerhard Kitzler Date: Thu, 16 Jan 2014 08:49:20 +0000 Subject: [PATCH] Changes for OCC 6.5 --- libsrc/occ/Partition_Inter3d.cxx | 4 ++-- libsrc/occ/Partition_Loop.cxx | 4 ++++ libsrc/occ/Partition_Spliter.cxx | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libsrc/occ/Partition_Inter3d.cxx b/libsrc/occ/Partition_Inter3d.cxx index a47ff2df..1066871a 100644 --- a/libsrc/occ/Partition_Inter3d.cxx +++ b/libsrc/occ/Partition_Inter3d.cxx @@ -243,8 +243,8 @@ static void PutInBounds (const TopoDS_Face& F, Standard_Integer i, nbExt = anExtPS.NbExt(); Extrema_POnSurf aPOnSurf; for (i = 1; i <= nbExt; ++i ) - if (anExtPS.Value( i ) <= TolE) // V6.3 - // if (anExtPS.SquareDistance( i ) <= TolE) // V6.5 + // if (anExtPS.Value( i ) <= TolE) // V6.3 + if (anExtPS.SquareDistance( i ) <= TolE) // V6.5 { aPOnSurf = anExtPS.Point( i ); break; diff --git a/libsrc/occ/Partition_Loop.cxx b/libsrc/occ/Partition_Loop.cxx index 49b72f5a..7170dd64 100644 --- a/libsrc/occ/Partition_Loop.cxx +++ b/libsrc/occ/Partition_Loop.cxx @@ -69,6 +69,10 @@ static char* name = new char[100]; static int nbe = 0; +#ifdef WIN32 +#define M_PI 3.14159265358979323846 +#endif + //======================================================================= //function : Partition_Loop //purpose : diff --git a/libsrc/occ/Partition_Spliter.cxx b/libsrc/occ/Partition_Spliter.cxx index 97bd8e33..6503880e 100644 --- a/libsrc/occ/Partition_Spliter.cxx +++ b/libsrc/occ/Partition_Spliter.cxx @@ -1169,8 +1169,8 @@ static void findEqual (const TopTools_ListOfShape& EL1, for (; j<=nbj && ok; ++j) { if (Extrema.IsMin(j)) { hasMin = Standard_True; - ok = Extrema.Value(j) <= tol; // V6.3 - // ok = Extrema.SquareDistance(j) <= tol; // V6.5 + // ok = Extrema.Value(j) <= tol; // V6.3 + ok = Extrema.SquareDistance(j) <= tol; // V6.5 } } }