From 5c8908e0f05ad732a59b097f2fe994cfd136e3b4 Mon Sep 17 00:00:00 2001
From: abv <abv@opencascade.com>
Date: Thu, 3 Sep 2015 09:51:15 +0300
Subject: [PATCH] Corrections made for OCCT 6.9.1.beta

- Graphic3d_Camera: comparison of real to zero by == is replaced by safer check against FLT_MIN (#25760)
- BRepBuilderAPI_Copy: new option copyMesh (#26458) is documented and made combinable with copyGeom
---
 src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx | 10 ++++--
 src/BRepBuilderAPI/BRepBuilderAPI_Copy.hxx | 37 ++++++----------------
 src/Graphic3d/Graphic3d_Camera.cxx         |  7 ++--
 3 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
index b84d53ca2c..98a20defff 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
@@ -26,12 +26,14 @@
 #include <TopoDS_Vertex.hxx>
 #include <Poly_Triangulation.hxx>
 
+namespace {
+
 //! Tool class implementing necessary functionality for copying geometry
 class BRepBuilderAPI_Copy_Modification : public BRepTools_Modification 
 {
 public:
   BRepBuilderAPI_Copy_Modification (const Standard_Boolean copyGeom,
-                                    const Standard_Boolean copyMesh = Standard_False)
+                                    const Standard_Boolean copyMesh)
     : myCopyGeom(copyGeom),
       myCopyMesh(copyMesh)
   {
@@ -66,7 +68,8 @@ public:
     if (T.IsNull())
       return Standard_False;
 
-    T = T->Copy();
+    if (myCopyGeom)
+      T = T->Copy();
     return Standard_True;
   }
 
@@ -143,6 +146,7 @@ private:
 
 DEFINE_STANDARD_HANDLE(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
 
+} // anonymous namespace
 
 //=======================================================================
 //function : BRepBuilderAPI_Copy
@@ -151,7 +155,7 @@ DEFINE_STANDARD_HANDLE(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
 
 BRepBuilderAPI_Copy::BRepBuilderAPI_Copy ()
 {
-  myModification = new BRepBuilderAPI_Copy_Modification(Standard_True);
+  myModification = new BRepBuilderAPI_Copy_Modification(Standard_True, Standard_False);
 }
 
 
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.hxx
index 9c5ada6261..3dc9c5f581 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.hxx
@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <BRepBuilderAPI_ModifyShape.hxx>
-#include <Standard_Boolean.hxx>
-class TopoDS_Shape;
 
+class TopoDS_Shape;
 
 //! Duplication of a shape.
 //! A Copy object provides a framework for:
@@ -36,7 +35,6 @@ class BRepBuilderAPI_Copy  : public BRepBuilderAPI_ModifyShape
 public:
 
   DEFINE_STANDARD_ALLOC
-
   
   //! Constructs an empty copy framework. Use the function
   //! Perform to copy shapes.
@@ -44,39 +42,22 @@ public:
   
   //! Constructs a copy framework and copies the shape S.
   //! Use the function Shape to access the result.
-  //! If copyGeom is False, only topological objects will be copied, while
-  //! geometry will be shared with original shape.
+  //! If copyMesh is True, triangulation contained in original shape will be 
+  //! copied along with geometry (by default, triangulation gets lost).
+  //! If copyGeom is False, only topological objects will be copied, while 
+  //! geometry and triangulation will be shared with original shape.
   //! Note: the constructed framework can be reused to copy
   //! other shapes: just specify them with the function Perform.
   Standard_EXPORT BRepBuilderAPI_Copy(const TopoDS_Shape& S, const Standard_Boolean copyGeom = Standard_True, const Standard_Boolean copyMesh = Standard_False);
   
   //! Copies the shape S.
   //! Use the function Shape to access the result.
-  //! If copyGeom is False, only topological objects will be copied, while
-  //! geometry will be shared with original shape.
+  //! If copyMesh is True, triangulation contained in original shape will be 
+  //! copied along with geometry (by default, triangulation gets lost).
+  //! If copyGeom is False, only topological objects will be copied, while 
+  //! geometry and triangulation will be shared with original shape.
   Standard_EXPORT void Perform (const TopoDS_Shape& S, const Standard_Boolean copyGeom = Standard_True, const Standard_Boolean copyMesh = Standard_False);
 
-
-
-
-protected:
-
-
-
-
-
-private:
-
-
-
-
-
 };
 
-
-
-
-
-
-
 #endif // _BRepBuilderAPI_Copy_HeaderFile
diff --git a/src/Graphic3d/Graphic3d_Camera.cxx b/src/Graphic3d/Graphic3d_Camera.cxx
index 7b38769e67..f6c043c534 100644
--- a/src/Graphic3d/Graphic3d_Camera.cxx
+++ b/src/Graphic3d/Graphic3d_Camera.cxx
@@ -50,11 +50,12 @@ namespace
   // relative z-range tolerance compatible with for floating point.
   static Standard_Real zEpsilon (const Standard_Real theValue)
   {
-    if (theValue == 0)
+    Standard_Real anAbsValue = Abs (theValue);
+    if (anAbsValue <= (double)FLT_MIN)
     {
-      return FLT_EPSILON;
+      return FLT_MIN;
     }
-    Standard_Real aLogRadix = Log10 (Abs (theValue)) / Log10 (FLT_RADIX);
+    Standard_Real aLogRadix = Log10 (anAbsValue) / Log10 (FLT_RADIX);
     Standard_Real aExp = Floor (aLogRadix);
     return FLT_EPSILON * Pow (FLT_RADIX, aExp);
   };