[cgma-dev] r5732 - cgm/branches/merge-cubit13.1/geom/OCC

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-09-10 11:48:00 -0500 (Mon, 10 Sep 2012)
New Revision: 5732

Modified:
   cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.3
Log:
Fix downloaded from OCC's Git repo., fixed bug 269.

Modified: cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.3
===================================================================
--- cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.3	2012-09-10 15:46:31 UTC (rev 5731)
+++ cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.3	2012-09-10 16:48:00 UTC (rev 5732)
@@ -118,3 +118,427 @@
        } // point is not a segment point
 
      } // T.Situation == IntRes2d_Unknown
+
+--- a/src/BOP/BOP_FaceBuilder.cxx
++++ b/src/BOP/BOP_FaceBuilder.cxx
+@@ -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