freecad/occ652.patch

   1 diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp
   2 --- FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp     2012-01-04 21:20:01.762755107 +0100
   3 +++ FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp  2012-01-04 21:23:57.808143007 +0100
   4 @@ -25,6 +25,16 @@
   5  #if defined(__MINGW32__)
   6  # include <GL/gl.h>
   7  # include <GL/glext.h>
   8 +#elif defined (FC_OS_MACOSX)
   9 +# include <OpenGL/gl.h>
  10 +# include <OpenGL/glu.h>
  11 +#elif defined (FC_OS_WIN32)
  12 +# include <Windows.h>
  13 +# include <GL/gl.h>
  14 +# include <GL/glu.h>
  15 +#else
  16 +# include <GL/gl.h>
  17 +# include <GL/glu.h>
  18  #endif
  19
  20  #include "GLImageBox.h"
  21 diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/AppPartPy.cpp FreeCAD-0.12.5284/src/Mod/Part/App/AppPartPy.cpp
  22 --- FreeCAD-0.12.5284.orig/src/Mod/Part/App/AppPartPy.cpp       2012-01-04 21:20:01.919420925 +0100
  23 +++ FreeCAD-0.12.5284/src/Mod/Part/App/AppPartPy.cpp    2012-01-04 21:27:16.473733409 +0100
  24 @@ -492,7 +492,7 @@
  25              d.SetCoord(vec.x, vec.y, vec.z);
  26          }
  27          Handle_Geom_Plane aPlane = new Geom_Plane(p, d);
  28 -        BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width);
  29 +        BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width, Precision::Confusion());
  30          return new TopoShapeFacePy(new TopoShape((Face.Face())));
  31      }
  32      catch (Standard_DomainError) {
  33 diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/Geometry.cpp FreeCAD-0.12.5284/src/Mod/Part/App/Geometry.cpp
  34 --- FreeCAD-0.12.5284.orig/src/Mod/Part/App/Geometry.cpp        2012-01-04 21:20:01.916087610 +0100
  35 +++ FreeCAD-0.12.5284/src/Mod/Part/App/Geometry.cpp     2012-01-04 21:28:01.363490221 +0100
  36 @@ -1252,7 +1252,7 @@
  37      Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(handle());
  38      Standard_Real u1,u2,v1,v2;
  39      s->Bounds(u1,u2,v1,v2);
  40 -    BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2);
  41 +    BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2, Precision::Confusion());
  42      return mkBuilder.Shape();
  43  }
  44
  45 diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/GeometrySurfacePyImp.cpp FreeCAD-0.12.5284/src/Mod/Part/App/GeometrySurfacePyImp.cpp
  46 --- FreeCAD-0.12.5284.orig/src/Mod/Part/App/GeometrySurfacePyImp.cpp    2012-01-04 21:20:01.919420925 +0100
  47 +++ FreeCAD-0.12.5284/src/Mod/Part/App/GeometrySurfacePyImp.cpp 2012-01-04 21:29:16.406417012 +0100
  48 @@ -79,7 +79,7 @@
  49              s->Bounds(u1,u2,v1,v2);
  50              if (!PyArg_ParseTuple(args, "|dddd", &u1,&u2,&v1,&v2))
  51                  return 0;
  52 -            BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2);
  53 +            BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2, Precision::Confusion());
  54              TopoDS_Shape sh = mkBuilder.Shape();
  55              return new TopoShapeFacePy(new TopoShape(sh));
  56          }
  57 diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/PrimitiveFeature.cpp FreeCAD-0.12.5284/src/Mod/Part/App/PrimitiveFeature.cpp
  58 --- FreeCAD-0.12.5284.orig/src/Mod/Part/App/PrimitiveFeature.cpp        2012-01-04 21:20:01.916087610 +0100
  59 +++ FreeCAD-0.12.5284/src/Mod/Part/App/PrimitiveFeature.cpp     2012-01-04 21:30:26.759369209 +0100
  60 @@ -191,7 +191,7 @@
  61      gp_Pnt pnt(0.0,0.0,0.0);
  62      gp_Dir dir(0.0,0.0,1.0);
  63      Handle_Geom_Plane aPlane = new Geom_Plane(pnt, dir);
  64 -    BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W);
  65 +    BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W, Precision::Confusion());
  66
  67      const char *error=0;
  68      switch (mkFace.Error())
  69 diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/TopoShape.cpp FreeCAD-0.12.5284/src/Mod/Part/App/TopoShape.cpp
  70 --- FreeCAD-0.12.5284.orig/src/Mod/Part/App/TopoShape.cpp       2012-01-04 21:20:01.922754240 +0100
  71 +++ FreeCAD-0.12.5284/src/Mod/Part/App/TopoShape.cpp    2012-01-05 00:54:08.116493768 +0100
  72 @@ -1335,7 +1335,7 @@
  73      double u1,u2,v1,v2;
  74      surf->Bounds(u1,u2,v1,v2);
  75
  76 -    BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2);
  77 +    BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2, Precision::Confusion());
  78      return mkBuilder.Face();
  79  }
  80
  81 @@ -1388,7 +1388,7 @@
  82
  83          Standard_Real u1,u2,v1,v2;
  84          mySurface->Bounds(u1,u2,v1,v2);
  85 -        BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2);
  86 +        BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2, Precision::Confusion());
  87          return mkBuilder.Shape();
  88      }
  89
  90 @@ -1440,7 +1440,7 @@
  91      mkSweep.Perform(tol, Standard_False, GeomAbs_C1, BSplCLib::MaxDegree(), 1000);
  92
  93      const Handle_Geom_Surface& surf = mkSweep.Surface();
  94 -    BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax);
  95 +    BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax, Precision::Confusion());
  96      return mkBuilder.Face();
  97  }
  98
  99 diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/TopoShapeFacePyImp.cpp FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeFacePyImp.cpp
 100 --- FreeCAD-0.12.5284.orig/src/Mod/Part/App/TopoShapeFacePyImp.cpp      2012-01-04 21:20:01.919420925 +0100
 101 +++ FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeFacePyImp.cpp   2012-01-04 21:33:14.611793209 +0100
 102 @@ -135,7 +135,7 @@
 103                  return -1;
 104              }
 105
 106 -            BRepBuilderAPI_MakeFace mkFace(S);
 107 +             BRepBuilderAPI_MakeFace mkFace(S, Precision::Confusion());
 108              if (bound) {
 109                  Py::List list(bound);
 110                  for (Py::List::iterator it = list.begin(); it != list.end(); ++it) {