[cgma-dev] r6048 - in cgm/trunk: . geom/OCC test

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-05-24 11:23:36 -0500 (Fri, 24 May 2013)
New Revision: 6048

Added:
   cgm/trunk/geom/OCC/occ_patches_6.6.0
Modified:
   cgm/trunk/README.CONFIGURE
   cgm/trunk/geom/OCC/OCCAttribSet.cpp
   cgm/trunk/geom/OCC/OCCLump.cpp
   cgm/trunk/geom/OCC/OCCModifyEngine.cpp
   cgm/trunk/geom/OCC/OCCPoint.cpp
   cgm/trunk/geom/OCC/OCCQueryEngine.cpp
   cgm/trunk/test/modify.cpp
   cgm/trunk/test/operation.cpp
   cgm/trunk/test/r_w.cpp
Log:
Added patch for opencascade6.6.0 build; Code is compatible with occ6.5 and 6.6; Fixed several memory leak and initial value problems. Passed both builds with occ654 and occ660 before and after intallation, for 'make check' check.

Modified: cgm/trunk/README.CONFIGURE
===================================================================
--- cgm/trunk/README.CONFIGURE	2013-05-24 15:16:13 UTC (rev 6047)
+++ cgm/trunk/README.CONFIGURE	2013-05-24 16:23:36 UTC (rev 6048)
@@ -42,4 +42,6 @@
   Execute the following commands in the top-most directory:
     autoreconf -fi
     ./configure
-    make dist
+    make 
+    make check 
+    make install

Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCAttribSet.cpp	2013-05-24 15:16:13 UTC (rev 6047)
+++ cgm/trunk/geom/OCC/OCCAttribSet.cpp	2013-05-24 16:23:36 UTC (rev 6048)
@@ -74,7 +74,7 @@
   TDF_Label aLabel, lab;
   Handle_TDataStd_Name attr_name;
   CubitString* type = csa->string_data_list()->get_and_step();
-  TCollection_ExtendedString cstring( (Standard_CString)type->c_str() );
+  TCollection_ExtendedString cstring( type->c_str(), CUBIT_TRUE );
 
   FindShape(shape, aLabel, found);
 
@@ -548,7 +548,7 @@
     return CUBIT_FAILURE;
 
   Handle_TDataStd_Name attr_name;
-  TCollection_ExtendedString cstring( (Standard_CString)name.c_str() );
+  TCollection_ExtendedString cstring( name.c_str(), CUBIT_TRUE );
   TDF_Label lab;
   for (TDF_ChildIterator it(aLabel,CUBIT_FALSE); it.More(); it.Next())
   {

Modified: cgm/trunk/geom/OCC/OCCLump.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCLump.cpp	2013-05-24 15:16:13 UTC (rev 6047)
+++ cgm/trunk/geom/OCC/OCCLump.cpp	2013-05-24 16:23:36 UTC (rev 6048)
@@ -46,7 +46,8 @@
 #include "BRepBndLib.hxx"
 #include "GProp_GProps.hxx"
 #include "BRepGProp.hxx"
-#include "BOP_SolidClassifier.hxx"
+#include "BRepClass3d_SolidExplorer.hxx"
+#include "BRepClass3d_SClassifier.hxx"
 #include "TopExp_Explorer.hxx"
 #include "TopoDS.hxx"
 #include "BRep_Tool.hxx"
@@ -335,9 +336,9 @@