[cgma-dev] r5979 - cgm/branches/merge-cubit12.2/geom/OCC

[jain at mcs.anl.gov]

Author: jain
Date: 2013-02-06 14:54:44 -0600 (Wed, 06 Feb 2013)
New Revision: 5979

Added:
   cgm/branches/merge-cubit12.2/geom/OCC/occ_patches_6.5.3
Log:
Adding patch to merge branch also

Added: cgm/branches/merge-cubit12.2/geom/OCC/occ_patches_6.5.3
===================================================================
--- cgm/branches/merge-cubit12.2/geom/OCC/occ_patches_6.5.3	                        (rev 0)
+++ cgm/branches/merge-cubit12.2/geom/OCC/occ_patches_6.5.3	2013-02-06 20:54:44 UTC (rev 5979)
@@ -0,0 +1,541 @@
+--- a/src/BOP/BOP_FaceBuilder.cxx	2012-04-13 07:38:39.000000000 -0500
++++ b/src/BOP/BOP_FaceBuilder.cxx	2012-09-25 12:32:16.000000000 -0500
+@@ -23,9 +23,15 @@
+ #include <Geom_Surface.hxx>
+ #include <Geom_Curve.hxx>
+ 
++#include <Geom2dInt_Geom2dCurveTool.hxx>
++
+ #include <BRep_Builder.hxx>
+ #include <BRep_Tool.hxx>
++
++#include <BRepLib.hxx>
++
+ #include <BRepAdaptor_Surface.hxx>
++#include <BRepAdaptor_Curve2d.hxx>
+ 
+ #include <TopAbs_Orientation.hxx>
+ 
+@@ -36,6 +42,9 @@
+ #include <TopTools_ListOfShape.hxx>
+ #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+ #include <TopTools_ListIteratorOfListOfShape.hxx>
++#include <TopTools_DataMapOfShapeShape.hxx>
++#include <TopTools_DataMapOfShapeListOfShape.hxx>
++#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
+ 
+ #include <TopoDS.hxx>
+ #include <TopoDS_Face.hxx>
+@@ -60,13 +69,8 @@
+ #include <BOP_BuilderTools.hxx>
+ #include <BOP_ListIteratorOfListOfConnexityBlock.hxx>
+ #include <BOP_ConnexityBlock.hxx>
++#include <BRepBuilderAPI_Copy.hxx>
+ 
+-//modified by NIZNHY-PKV Wed Feb 29 10:04:56 2012t
+-#include <TopTools_DataMapOfShapeShape.hxx>
+-#include <TopTools_DataMapOfShapeListOfShape.hxx>
+-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
+-#include <BRepAdaptor_Curve2d.hxx>
+-#include <Geom2dInt_Geom2dCurveTool.hxx>
+ 
+ static
+   Standard_Boolean IsGrowthWire(const TopoDS_Shape& theWire,
+@@ -78,7 +82,6 @@
+   Standard_Boolean IsInside(const TopoDS_Shape& theHole,
+ 			    const TopoDS_Shape& theF2,