Author: janehu Date: 2012-07-19 09:58:03 -0500 (Thu, 19 Jul 2012) New Revision: 5635 Added: cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.3 Log: Added the patch for occ6.5.3 build. Added: cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.3 =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.3 (rev 0) +++ cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.3 2012-07-19 14:58:03 UTC (rev 5635) @@ -0,0 +1,120 @@ +--- BRepBuilderAPI_Collect.cxx 2012-06-28 11:03:44.000000000 -0500 ++++ ./BRepBuilderAPI/BRepBuilderAPI_Collect.cxx 2012-06-28 11:25:58.000000000 -0500 +@@ -217,9 +217,18 @@ + BuildBack (myGen, GenBack); // Vraiment pas optimum a Revoir + BuildBack (myMod, ModBack); + +- Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_FACE); +- Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_EDGE); +- Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_VERTEX); ++ TopAbs_ShapeEnum type = SI.ShapeType(); ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,type); ++ if(type < TopAbs_SHELL) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_SHELL); ++ if(type < TopAbs_FACE) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_FACE); ++ if(type < TopAbs_WIRE) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_WIRE); ++ if(type < TopAbs_EDGE) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_EDGE); ++ if(type < TopAbs_VERTEX) ++ Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_VERTEX); + + #ifdef DEB + if (Affich) { + +--- Extrema_ExtPElS.cxx 2012-06-28 11:06:27.000000000 -0500 ++++ ./Extrema/Extrema_ExtPElS.cxx 2012-07-17 11:48:25.000000000 -0500 +@@ -71,6 +71,7 @@ + gp_Vec myZ = Pos.XDirection()^Pos.YDirection(); + Standard_Real U1 = gp_Vec(Pos.XDirection()).AngleWithRef(OPp,myZ); //-M_PI<U1<M_PI + Standard_Real U2 = U1 + M_PI; ++ if(U1 > -Tol && U1 < 0.) {U1 = 0.;} + if (U1 < 0.) { U1 += 2. * M_PI; } + + gp_Pnt Ps; +@@ -167,7 +168,9 @@ + B = MP.Angle(DirZ); + if (!Same) { U1 += M_PI; } + U2 = U1 + M_PI; ++ if(U1 > -Tol && U1 < 0.) {U1 = 0.;} + if (U1 < 0.) { U1 += 2. * M_PI; } ++ if (U2 - 2.*M_PI < Tol && U2 > 2.*M_PI) {U2 = 2. * M_PI; } + if (U2 > 2.*M_PI) { U2 -= 2. * M_PI; } + B = MP.Angle(DirZ); + A = Abs(A); +@@ -258,6 +261,7 @@