set is_delete=0
set verbose_level=2
set params=""
-set modules=(KERNEL GUI GEOM MED SMESH VISU PARAVIS YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER HEXABLOCK HEXABLOCKPLUGIN ATOMIC ATOMGEN ATOMSOLV HOMARD JOBMANAGER)
+set modules=(KERNEL GUI GEOM MED SMESH VISU PARAVIS YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER HEXABLOCK HEXABLOCKPLUGIN ATOMIC ATOMGEN ATOMSOLV HOMARD JOBMANAGER)
set optim=""
set is_install=1
set is_help=0
is_delete=0
verbose_level=2
params=""
-modules="KERNEL GUI GEOM MED SMESH VISU PARAVIS YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER HEXABLOCK HEXABLOCKPLUGIN ATOMIC ATOMGEN ATOMSOLV HOMARD JOBMANAGER"
+modules="KERNEL GUI GEOM MED SMESH VISU PARAVIS YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER HEXABLOCK HEXABLOCKPLUGIN ATOMIC ATOMGEN ATOMSOLV HOMARD JOBMANAGER"
optim=""
is_install=1
is_tui=0
+++ /dev/null
-diff -Naur --exclude=CVS OCCT-6.5.3_SRC_orig/inc/ApproxInt_PrmPrmSvSurfaces.gxx OCCT-6.5.3_SRC_patch/inc/ApproxInt_PrmPrmSvSurfaces.gxx
---- OCCT-6.5.3_SRC_orig/inc/ApproxInt_PrmPrmSvSurfaces.gxx 2012-04-13 16:38:37.000000000 +0400
-+++ OCCT-6.5.3_SRC_patch/inc/ApproxInt_PrmPrmSvSurfaces.gxx 2012-05-18 12:29:02.000000000 +0400
-@@ -24,6 +24,7 @@
-
- #include <TColStd_Array1OfReal.hxx>
- #include <math_FunctionSetRoot.hxx>
-+#include <Precision.hxx>
-
- #define Debug(expr) cout<<" expr :"<<expr;
- #define MySurf1 MyIntersectionOn2S.Function().AuxillarSurface1()
-@@ -173,7 +174,12 @@
- TgTU = Tg.Dot(TU);
- TgTV = Tg.Dot(TV);
- DIS = TUTU * TVTV - TUTV * TUTV;
--
-+ if(fabs(DIS)<Precision::Angular()) {
-+ MyIsTangent=Standard_False;
-+ MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
-+ return(Standard_False);
-+ }
-+
- DeltaU = (TgTU * TVTV - TgTV * TUTV ) / DIS ;
- DeltaV = (TgTV * TUTU - TgTU * TUTV ) / DIS ;
-
-@@ -189,7 +195,12 @@
- TUTV = TU.Dot(TV);
- TgTU = Tg.Dot(TU);
- TgTV = Tg.Dot(TV);
-- DIS = TUTU * TVTV - TUTV * TUTV;
-+ DIS = TUTU * TVTV - TUTV * TUTV;
-+ if(fabs(DIS)<Precision::Angular()) {
-+ MyIsTangent=Standard_False;
-+ MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
-+ return(Standard_False);
-+ }
-
- DeltaU = (TgTU * TVTV - TgTV * TUTV ) / DIS ;
- DeltaV = (TgTV * TUTU - TgTU * TUTV ) / DIS ;
-diff -Naur --exclude=CVS OCCT-6.5.3_SRC_orig/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx OCCT-6.5.3_SRC_patch/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx
---- OCCT-6.5.3_SRC_orig/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx 2012-04-13 16:38:37.000000000 +0400
-+++ OCCT-6.5.3_SRC_patch/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx 2012-05-18 12:29:02.000000000 +0400
-@@ -24,6 +24,7 @@
-
- #include <TColStd_Array1OfReal.hxx>
- #include <math_FunctionSetRoot.hxx>
-+#include <Precision.hxx>
-
- #define Debug(expr) cout<<" expr :"<<expr;
- #define MySurf1 MyIntersectionOn2S.Function().AuxillarSurface1()
-@@ -173,7 +174,12 @@
- TgTU = Tg.Dot(TU);
- TgTV = Tg.Dot(TV);
- DIS = TUTU * TVTV - TUTV * TUTV;
--
-+ if(fabs(DIS)<Precision::Angular()) {
-+ MyIsTangent=Standard_False;
-+ MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
-+ return(Standard_False);
-+ }
-+
- DeltaU = (TgTU * TVTV - TgTV * TUTV ) / DIS ;
- DeltaV = (TgTV * TUTU - TgTU * TUTV ) / DIS ;
-
-@@ -189,7 +195,12 @@
- TUTV = TU.Dot(TV);
- TgTU = Tg.Dot(TU);
- TgTV = Tg.Dot(TV);
-- DIS = TUTU * TVTV - TUTV * TUTV;
-+ DIS = TUTU * TVTV - TUTV * TUTV;
-+ if(fabs(DIS)<Precision::Angular()) {
-+ MyIsTangent=Standard_False;
-+ MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
-+ return(Standard_False);
-+ }
-
- DeltaU = (TgTU * TVTV - TgTV * TUTV ) / DIS ;
- DeltaV = (TgTV * TUTU - TgTU * TUTV ) / DIS ;
--- /dev/null
+diff --git a/src/BOPTools/BOPTools_Tools3D_1.cxx b/src/BOPTools/BOPTools_Tools3D_1.cxx
+index e235c47..9913925 100755
+--- a/src/BOPTools/BOPTools_Tools3D_1.cxx
++++ b/src/BOPTools/BOPTools_Tools3D_1.cxx
+@@ -26,36 +26,73 @@
+ #include <gp_Pnt2d.hxx>
+ #include <gp_Vec2d.hxx>
+ #include <gp_Dir2d.hxx>
+-
+ #include <gp_Dir.hxx>
+ #include <gp_Vec.hxx>
+
++#include <Poly_Triangulation.hxx>
++
+ #include <Geom2d_Curve.hxx>
++#include <Geom2d_Line.hxx>
++
+ #include <Geom_Curve.hxx>
+ #include <Geom_Surface.hxx>
+
+ #include <GeomAdaptor_Surface.hxx>
+ #include <GeomAPI_ProjectPointOnSurf.hxx>
+
++#include <Geom2dHatch_Hatcher.hxx>
++#include <HatchGen_Domain.hxx>
++
+ #include <BRepTools.hxx>
+ #include <BRepClass3d_SolidClassifier.hxx>
+
+ #include <BRep_Tool.hxx>
+ #include <BRepAdaptor_Surface.hxx>
+
+-#include <TopTools_ListIteratorOfListOfShape.hxx>
++
+ #include <TopExp_Explorer.hxx>
+ #include <TopoDS.hxx>
++#include <TopoDS_Iterator.hxx>
++
+ #include <TopTools_ListOfShape.hxx>
++#include <TopTools_IndexedMapOfShape.hxx>
++#include <TopTools_ListIteratorOfListOfShape.hxx>
++
++#include <BRep_TVertex.hxx>
++#include <BRep_ListIteratorOfListOfPointRepresentation.hxx>
++#include <BRep_PointRepresentation.hxx>
++#include <BRep_TEdge.hxx>
++#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
++#include <BRep_CurveRepresentation.hxx>
++#include <BRep_TFace.hxx>
++#include <BRep_Builder.hxx>
+
+ #include <BOPTools_Tools2D.hxx>
+
+-static Standard_Boolean CheckPointInside(BRepClass3d_SolidClassifier& aSolidClassifier,
+- const gp_Pnt& aP3d,
+- const Standard_Real aTolerance,
+- const Handle(IntTools_Context)& theContext,
+- TopAbs_State& aState,
+- Standard_Boolean& bFoundInFacePoint);
++#include <IntTools_Tools.hxx>
++
++
++static
++ Standard_Boolean HasGeometry(const TopoDS_Shape& aS);
++
++static
++ void Add(const TopoDS_Shape& aS,
++ TopTools_IndexedMapOfShape& myShapes,
++ Standard_Boolean& bHasGeometry);
++
++static
++ Standard_Boolean CheckPointInside(BRepClass3d_SolidClassifier& aSolidClassifier,
++ const gp_Pnt& aP3d,
++ const Standard_Real aTolerance,
++ const Handle(IntTools_Context)& theContext,
++ TopAbs_State& aState,
++ Standard_Boolean& bFoundInFacePoint);
++static
++ Standard_Integer PntInFace(const TopoDS_Face& aF,
++ const Handle(IntTools_Context)& theContext,
++ gp_Pnt& theP,
++ gp_Pnt2d& theP2D);
++
+
+ //=======================================================================
+ //function : GetApproxNormalToFaceOnEdge
+@@ -135,10 +172,8 @@ void BOPTools_Tools3D::GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aE,
+ aFTol=aETol;
+ }
+ }
+- //modified by NIZNHY-PKV Thu Mar 19 14:15:15 2009f
+ if( aETol > 1.e-5 || aFTol > 1.e-5 ) {
+ //if( aETol > 1.e-5 && aFTol > 1.e-5 ) {
+- //modified by NIZNHY-PKV Thu Mar 19 14:15:24 2009t
+ //pkv/103/D7
+ if(aTS!=GeomAbs_Sphere) {
+ gp_Vec2d transVec( aDP );
+@@ -627,25 +662,7 @@ void BOPTools_Tools3D::GetApproxNormalToFaceOnEdge (const TopoDS_Edge& aE,
+ }
+
+
+-#include <TopTools_IndexedMapOfShape.hxx>
+-#include <TopoDS_Iterator.hxx>
+-#include <BRep_TVertex.hxx>
+-#include <BRep_ListIteratorOfListOfPointRepresentation.hxx>
+-#include <BRep_PointRepresentation.hxx>
+-#include <BRep_TEdge.hxx>
+-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
+-#include <BRep_CurveRepresentation.hxx>
+-#include <BRep_TFace.hxx>
+-#include <Poly_Triangulation.hxx>
+-#include <BRep_Builder.hxx>
+-
+-static
+- Standard_Boolean HasGeometry(const TopoDS_Shape& aS);
+
+-static
+- void Add(const TopoDS_Shape& aS,
+- TopTools_IndexedMapOfShape& myShapes,
+- Standard_Boolean& bHasGeometry);
+
+ //=======================================================================
+ //function : IsEmptyShape
+@@ -975,7 +992,7 @@ Standard_Boolean BOPTools_Tools3D::ComputeFaceState(const TopoDS_Face& theFace,
+ return Standard_True;
+ }
+
+-//modified by NIZNHY-PKV Thu Sep 22 10:55:14 2011f
++
+ // ===========================================================================================
+ // function: CheckSameDomainFaceInside
+ // purpose: Check if distance between several points of theFace1 and
+@@ -986,7 +1003,7 @@ Standard_Boolean BOPTools_Tools3D::CheckSameDomainFaceInside(const TopoDS_Face&
+ const Handle(IntTools_Context)& theContext)
+ {
+ Standard_Boolean bFoundON, bPointInFace;
+- Standard_Integer nbpoints, i, j;
++ Standard_Integer nbpoints, i, j, iErr;
+ Standard_Real umin, umax, vmin, vmax, aTol, adeltau, adeltav, U, V, U2, V2, aD, aTolE;
+ gp_Pnt2d aP2D;
+ gp_Pnt aP3D;
+@@ -1037,9 +1054,35 @@ Standard_Boolean BOPTools_Tools3D::CheckSameDomainFaceInside(const TopoDS_Face&
+ }
+ }
+ }
++ //
++ if (bFoundON) {
++ return bFoundON;
++ }
++ //
++ iErr=PntInFace(theFace1, theContext, aP3D, aP2D);
++ if (iErr) {
++ return bFoundON;
++ }
++ //
++ aProjector.Perform(aP3D);
++ if(aProjector.IsDone()) {
++ aD=aProjector.LowerDistance();
++ if(aD > aTol) {
++ return bFoundON;
++ }
++ //
++ aProjector.LowerDistanceParameters(U2, V2);
++ aP2D.SetCoord(U2, V2);
++ //
++ bPointInFace=theContext->IsPointInFace(theFace2, aP2D);
++ if (bPointInFace) {
++ bFoundON = Standard_True;
++ }
++ }
++ //
+ return bFoundON;
+ }
+-//modified by NIZNHY-PKV Thu Sep 22 10:55:19 2011t
++
+
+ // ===========================================================================================
+ // function: CheckPointInside
+@@ -1089,3 +1132,88 @@ Standard_Boolean CheckPointInside(BRepClass3d_SolidClassifier& aSolidClassifier,
+
+ return bFoundValidPoint;
+ }
++
++//=======================================================================
++//function : PntInFace
++//purpose :
++//=======================================================================
++Standard_Integer PntInFace(const TopoDS_Face& aF,
++ const Handle(IntTools_Context)& aCtx,
++ gp_Pnt& theP,
++ gp_Pnt2d& theP2D)
++{
++ Standard_Boolean bIsDone, bHasFirstPoint, bHasSecondPoint;
++ Standard_Integer iErr, aIx, aNbDomains, i;
++ Standard_Real aUMin, aUMax, aVMin, aVMax;
++ Standard_Real aVx, aUx, aV1, aV2;
++ gp_Dir2d aD2D (0., 1.);
++ gp_Pnt2d aP2D;
++ gp_Pnt aPx;
++ Handle(Geom2d_Line) aL2D;
++ Handle(Geom_Surface) aS;
++ //
++ iErr=0;
++ //
++ aS=BRep_Tool::Surface(aF);
++ BRepTools::UVBounds(aF, aUMin, aUMax, aVMin, aVMax);
++ //
++ // 1
++ aUx=IntTools_Tools::IntermediatePoint(aUMin, aUMax);
++ aP2D.SetCoord(aUx, 0.);
++ aL2D=new Geom2d_Line (aP2D, aD2D);
++ Geom2dAdaptor_Curve aHCur(aL2D);
++ //
++ Geom2dHatch_Hatcher& aHatcher=aCtx->Hatcher(aF);
++ aIx=aHatcher.AddHatching(aHCur) ;
++ //
++ // 2.
++ aHatcher.Trim();
++ bIsDone=aHatcher.TrimDone(aIx);
++ if (!bIsDone) {
++ aHatcher.RemHatching(aIx);
++ iErr=3;
++ return iErr;
++ }
++ //
++ aHatcher.ComputeDomains(aIx);
++ bIsDone=aHatcher.IsDone(aIx);
++ if (!bIsDone) {
++ aHatcher.RemHatching(aIx);
++ iErr=4;
++ return iErr;
++ }
++ //
++ // 3.
++ aNbDomains=aHatcher.NbDomains(aIx);
++ for (i=1; i<=aNbDomains; ++i) {
++ const HatchGen_Domain& aDomain=aHatcher.Domain (aIx, i) ;
++ bHasFirstPoint=aDomain.HasFirstPoint();
++ if (!bHasFirstPoint) {
++ iErr=5;
++ break;
++ }
++ //
++ aV1=aDomain.FirstPoint().Parameter();
++ //
++ bHasSecondPoint=aDomain.HasSecondPoint();
++ if (!bHasSecondPoint) {
++ aHatcher.RemHatching(aIx);
++ iErr=6;
++ break;
++ }
++ //
++ aV2=aDomain.SecondPoint().Parameter();
++ aVx=IntTools_Tools::IntermediatePoint(aV1, aV2);
++ break;
++ }
++ //
++ if (!iErr) {
++ aS->D0(aUx, aVx, aPx);
++ //
++ theP2D.SetCoord(aUx, aVx);
++ theP=aPx;
++ //
++ }
++ aHatcher.RemHatching(aIx);
++ return iErr;
++}
+diff --git a/src/Draft/Draft_Modification.cxx b/src/Draft/Draft_Modification.cxx
+index e72fe8d..6033694 100755
+--- a/src/Draft/Draft_Modification.cxx
++++ b/src/Draft/Draft_Modification.cxx
+@@ -58,6 +58,7 @@
+ #include <Precision.hxx>
+
+ #include <BRep_Builder.hxx>
++#include <BRepTools.hxx>
+
+ //=======================================================================
+ //function : Draft_Modification
+@@ -422,23 +423,34 @@ Standard_Boolean Draft_Modification::NewCurve2d(const TopoDS_Edge& E,
+ (typs == STANDARD_TYPE(Geom_ConicalSurface));
+
+ if ( JeRecadre) {
+- gp_Pnt2d PF,PL;
+- BRep_Tool::UVPoints(E,F,PF,PL);
+- gp_Pnt2d NewPF = C->Value(Fp);
+- gp_Vec2d vectra(2.*M_PI,0.);
+-
+- if (NewPF.Translated(vectra).SquareDistance(PF)
+- < NewPF.SquareDistance(PF)) {
+- C->Translate(vectra);
+-
++ Standard_Boolean bTranslate;
++ Standard_Real aD2, aT1, aT2;
++ gp_Pnt2d PF, NewPF, aP2DT;
++ gp_Vec2d aV2DT, vectra(2.*M_PI,0.);
++ Handle(Geom2d_Curve) aC2DE;
++ //
++ aC2DE=BRep_Tool::CurveOnSurface(E, F, aT1, aT2);
++ //
++ PF=aC2DE->Value(0.5*(aT1+aT2));
++ //
++ NewPF=C->Value(0.5*(Fp+Lp));
++ //
++ aD2=NewPF.SquareDistance(PF);
++ //
++ bTranslate=Standard_False;
++ if (NewPF.Translated(vectra).SquareDistance(PF) < aD2) {
++ aV2DT=vectra;
++ bTranslate=!bTranslate; //True
+ }
+- else if (NewPF.Translated(-vectra).SquareDistance(PF)
+- < NewPF.SquareDistance(PF)) {
+- C->Translate(-vectra);
+-
++ else if (NewPF.Translated(-vectra).SquareDistance(PF) < aD2) {
++ aV2DT=-vectra;
++ bTranslate=!bTranslate; //True
++ }
++ //
++ if (bTranslate) {
++ C->Translate(aV2DT);
+ }
+ }
+-
+ return Standard_True;
+ }
+
+diff --git a/src/IntTools/IntTools_LineConstructor.cxx b/src/IntTools/IntTools_LineConstructor.cxx
+index b88f063..984530e 100755
+--- a/src/IntTools/IntTools_LineConstructor.cxx
++++ b/src/IntTools/IntTools_LineConstructor.cxx
+@@ -735,6 +735,7 @@ void IntTools_LineConstructor::TreatCircle(const Handle(IntPatch_Line)& aLine,
+ return;
+ }
+ //----------------------------------------
++ Standard_Boolean bFound;
+ Standard_Integer aNbVtx, aNbVtxWas, i;
+ Standard_Real aTolPC, aT, aT1, aT2, aTmid, aTwoPI, aTolPC1;
+ Standard_Real aU1, aV1, aU2, aV2;
+@@ -747,6 +748,7 @@ void IntTools_LineConstructor::TreatCircle(const Handle(IntPatch_Line)& aLine,
+ aTwoPI=M_PI+M_PI;
+ aTolPC=Precision::PConfusion();
+ aNbVtxWas=GeomInt_LineTool::NbVertex(aLine);
++
+ aNbVtx=aNbVtxWas+2;
+ //-------------------------------------2
+ aTS1=myHS1->GetType();
+@@ -761,7 +763,7 @@ void IntTools_LineConstructor::TreatCircle(const Handle(IntPatch_Line)& aLine,
+ pVtx=new IntTools_RealWithFlag [aNbVtx];
+ //
+ pVtx[0].SetValue(0.);
+- pVtx[1].SetValue(2.*M_PI);
++ pVtx[1].SetValue(aTwoPI);
+ //
+ for(i=1; i<=aNbVtxWas; ++i) {
+ aT=GeomInt_LineTool::Vertex(aLine, i).ParameterOnLine();
+@@ -775,6 +777,27 @@ void IntTools_LineConstructor::TreatCircle(const Handle(IntPatch_Line)& aLine,
+ //
+ RejectDuplicates(aNbVtx, pVtx, aTolPC);
+ //
++ if ((aType==IntPatch_Circle || aType==IntPatch_Ellipse)&& aNbVtx>2) { // zz
++ bFound=Standard_False;
++ for(i=1; i<=aNbVtxWas; ++i) {
++ aT=GeomInt_LineTool::Vertex(aLine, i).ParameterOnLine();
++ if (fabs(aT) < aTolPC1 || fabs(aT-aTwoPI) < aTolPC1) {
++ bFound=!bFound;
++ break;
++ }
++ }
++ if (!bFound) {
++ aT=pVtx[1].Value()+aTwoPI;
++ pVtx[aNbVtx-1].SetValue(aT);
++ //
++ for(i=0; i<aNbVtx; ++i) {
++ aT=pVtx[i+1].Value();
++ pVtx[i].SetValue(aT);
++ }
++ --aNbVtx;
++ }
++ }
++ //
+ for(i=0; i<aNbVtx-1; ++i) {
+ aT1=pVtx[i].Value();
+ aT2=pVtx[i+1].Value();
+diff --git a/tests/boolean/bopcommon_complex/C5 b/tests/boolean/bopcommon_complex/C5
+old mode 100644
+new mode 100755
+index c174e8b..d2cd9ea
+--- a/tests/boolean/bopcommon_complex/C5
++++ b/tests/boolean/bopcommon_complex/C5
+@@ -1,3 +1,7 @@
++puts "TODO ?OCC23823 All: An exception was caught"
++puts "TODO ?OCC23823 All: \\*\\* Exception \\*\\*"
++puts "TODO ?OCC23823 All: TEST INCOMPLETE"
++
+ cpulimit 3600
+ restore [locate_data_file BUC60937.brep] sh
+ explode sh
+diff --git a/tests/boolean/bopcommon_complex/C9 b/tests/boolean/bopcommon_complex/C9
+old mode 100644
+new mode 100755
+index c174e8b..d2cd9ea
+--- a/tests/boolean/bopcommon_complex/C9
++++ b/tests/boolean/bopcommon_complex/C9
+@@ -1,3 +1,7 @@
++puts "TODO ?OCC23823 All: An exception was caught"
++puts "TODO ?OCC23823 All: \\*\\* Exception \\*\\*"
++puts "TODO ?OCC23823 All: TEST INCOMPLETE"
++
+ cpulimit 3600
+ restore [locate_data_file BUC60937.brep] sh
+ explode sh
+diff --git a/tests/boolean/bopcommon_complex/D5 b/tests/boolean/bopcommon_complex/D5
+old mode 100644
+new mode 100755
+index f899d4c..4b50e24
+--- a/tests/boolean/bopcommon_complex/D5
++++ b/tests/boolean/bopcommon_complex/D5
+@@ -1,3 +1,7 @@
++puts "TODO ?OCC23823 All: An exception was caught"
++puts "TODO ?OCC23823 All: \\*\\* Exception \\*\\*"
++puts "TODO ?OCC23823 All: TEST INCOMPLETE"
++
+ cpulimit 3600
+ restore [locate_data_file BUC60936.brep] sh
+ explode sh
+diff --git a/tests/bugs/modalg/bug23823 b/tests/bugs/modalg/bug23823
+new file mode 100755
+index 0000000..bd6183d
+--- /dev/null
++++ b/tests/bugs/modalg/bug23823
+@@ -0,0 +1,39 @@
++puts "============"
++puts "OCC23823"
++puts "============"
++puts ""
++#######################################################################
++# The result of section operation contains redundant vertex.
++#######################################################################
++
++set BugNumber OCC23823
++
++restore [locate_data_file bug23823_SAS_MAT_rota.brep] b1
++restore [locate_data_file bug23823_cylindre_ext.brep] b2
++
++explode b1 f
++explode b2 f
++
++copy b1_3 b1
++copy b2_1 b2
++
++bop b1 b2
++bopsection result
++
++set nb_v_good 2
++set nb_e_good 1
++set nb_w_good 0
++set nb_f_good 0
++set nb_sh_good 0
++set nb_sol_good 0
++set nb_compsol_good 0
++set nb_compound_good 1
++set nb_shape_good 4
++
++set nb_info [nbshapes result]
++
++# Service parameters
++set mass -0.1
++set m -0.1
++
++set 2dviewer 1
+diff --git a/tests/bugs/modalg/bug23826 b/tests/bugs/modalg/bug23826
+new file mode 100755
+index 0000000..197df57
+--- /dev/null
++++ b/tests/bugs/modalg/bug23826
+@@ -0,0 +1,17 @@
++puts "============"
++puts "CR23826"
++puts "============"
++puts ""
++#########################################################
++## Boolean Common between two soids fails
++#########################################################
++
++restore [locate_data_file bug23826_Carte.brep] b1
++restore [locate_data_file bug23826_Use140.brep] b2
++
++bop b1 b2
++bopcommon result
++
++set square 6.51574
++
++set 2dviewer 1
+diff --git a/tests/draft/angle/E5 b/tests/draft/angle/E5
+old mode 100644
+new mode 100755
+index c6077e5..153e19a
+--- a/tests/draft/angle/E5
++++ b/tests/draft/angle/E5
+@@ -1,5 +1,6 @@
+ #C2----------------------------------------------
+ puts "TODO #23211 Debian40: Error: The tolerance of result shape is too big"
++puts "TODO ?OCC23823 All:Faulty shapes in variables faulty_1 to faulty_"
+
+ plane p 0 0 0 1 0 0 0 0 -1
+ pcone p p 15 18 20
+diff --git a/tests/offset/shape_type_a/A4 b/tests/offset/shape_type_a/A4
+old mode 100644
+new mode 100755
+index f44934c..d45c329
+--- a/tests/offset/shape_type_a/A4
++++ b/tests/offset/shape_type_a/A4
+@@ -1,3 +1,7 @@
++
++puts "TODO ?OCC23823 ALL:Error : The offset is not valid. The volume is"
++puts "TODO ?OCC23823 ALL:Error : The volume"
++
+ #old file ofs9
+
+ restore [locate_data_file CHE_bb9.rle] s
+diff -Naur --exclude=CVS OCCT-6.5.4_SRC.orig/src/Draw/Draw_Window.cxx OCCT-6.5.4_SRC.patch/src/Draw/Draw_Window.cxx
+--- OCCT-6.5.4_SRC.orig/src/Draw/Draw_Window.cxx 2012-11-15 18:00:13.000000000 +0400
++++ OCCT-6.5.4_SRC.patch/src/Draw/Draw_Window.cxx 2013-02-22 18:57:28.000000000 +0400
+@@ -84,7 +84,11 @@
+ errChannel = Tcl_GetStdChannel(TCL_STDERR);
+ if (code != TCL_OK) {
+ if (errChannel) {
++#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 5)))
++ Tcl_Write(errChannel, Tcl_GetStringResult(Interp), -1);
++#else
+ Tcl_Write(errChannel, Interp->result, -1);
++#endif
+ Tcl_Write(errChannel, "\n", 1);
+ }
+ Tcl_AddErrorInfo(Interp,
+@@ -1055,7 +1059,11 @@
+ mainWindow =
+ Tk_MainWindow(interp) ;
+ if (mainWindow == NULL) {
++#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 5)))
++ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
++#else
+ fprintf(stderr, "%s\n", interp->result);
++#endif
+ exit(1);
+ }
+ Tk_Name(mainWindow) =
+@@ -2061,7 +2069,11 @@
+ Standard_Integer res = Tk_Init (interp);
+ if (res != TCL_OK)
+ {
++#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 5)))
++ cout << "tkLoop: error in Tk initialization. Tcl reported: " << Tcl_GetStringResult(interp) << endl;
++#else
+ cout << "tkLoop: error in Tk initialization. Tcl reported: " << interp->result << endl;
++#endif
+ }
+ }
+ catch (Standard_Failure)
+@@ -2072,7 +2084,11 @@
+ mainWindow = Tk_MainWindow (interp);
+ if (mainWindow == NULL)
+ {
++#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 5)))
++ fprintf (stderr, "%s\n", Tcl_GetStringResult(interp));
++#else
+ fprintf (stderr, "%s\n", interp->result);
++#endif
+ cout << "tkLoop: Tk_MainWindow() returned NULL. Exiting...\n";
+ Tcl_Exit (0);
+ }
+++ /dev/null
-diff -Naur --exclude=CVS PyQt-4.9.1_SRC.orig/sip/QtDBus/qpydbuspendingreply.sip PyQt-4.9.1_SRC/sip/QtDBus/qpydbuspendingreply.sip
---- PyQt-4.9.1_SRC.orig/sip/QtDBus/qpydbuspendingreply.sip 2012-02-10 14:35:14.000000000 +0400
-+++ PyQt-4.9.1_SRC/sip/QtDBus/qpydbuspendingreply.sip 2012-04-04 15:21:35.000000000 +0400
-@@ -23,6 +23,8 @@
- // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
-+%If (Qt_4_7_0 -)
-+
- class QPyDBusPendingReply : QDBusPendingCall /PyName=QDBusPendingReply/
- {
- %TypeHeaderCode
-@@ -47,3 +49,5 @@
-
- SIP_PYOBJECT value(SIP_PYOBJECT type /DocValue="None"/ = 0) const /HoldGIL/;
- };
-+
-+%End
-diff -Naur --exclude=CVS PyQt-4.9.1_SRC.orig/sip/QtDBus/qpydbusreply.sip PyQt-4.9.1_SRC/sip/QtDBus/qpydbusreply.sip
---- PyQt-4.9.1_SRC.orig/sip/QtDBus/qpydbusreply.sip 2012-02-10 14:35:14.000000000 +0400
-+++ PyQt-4.9.1_SRC/sip/QtDBus/qpydbusreply.sip 2012-04-04 15:21:40.000000000 +0400
-@@ -23,6 +23,8 @@
- // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
-+%If (Qt_4_7_0 -)
-+
- class QPyDBusReply /PyName=QDBusReply/
- {
- %TypeHeaderCode
-@@ -241,3 +243,5 @@
- return 0;
- %End
- };
-+
-+%End
+++ /dev/null
-diff -Naur --exclude=CVS QScintilla-2.6.1_SRC_orig/Qt4/ListBoxQt.cpp QScintilla-2.6.1_SRC/Qt4/ListBoxQt.cpp
---- QScintilla-2.6.1_SRC_orig/Qt4/ListBoxQt.cpp 2012-02-10 13:59:50.000000000 +0400
-+++ QScintilla-2.6.1_SRC/Qt4/ListBoxQt.cpp 2012-04-04 17:44:23.000000000 +0400
-@@ -245,9 +245,7 @@
- void QsciListBoxQt::RegisterRGBAImage(int type, int, int,
- const unsigned char *pixelsImage)
- {
-- QPixmap pm;
--
-- pm.convertFromImage(*reinterpret_cast<const QImage *>(pixelsImage));
-+ QPixmap pm = QPixmap::fromImage(*reinterpret_cast<const QImage *>(pixelsImage));
- xset.insert(type, pm);
- }
-
+++ /dev/null
-diff -Naur doxygen-1.7.3_orig/src/resize.js doxygen-1.7.3_new/src/resize.js
---- doxygen-1.7.3_orig/src/resize.js 2010-12-12 21:53:19.000000000 +0300
-+++ doxygen-1.7.3_new/src/resize.js 2011-04-08 19:04:50.000000000 +0400
-@@ -1,5 +1,6 @@
- var cookie_namespace = 'doxygen';
- var sidenav,navtree,content,header;
-+var navrows = new Array();
-
- function readCookie(cookie)
- {
-@@ -36,27 +37,45 @@
-
- function resizeWidth()
- {
-- var windowWidth = $(window).width() + "px";
-+ var windowWidth = $(window).width();
- var sidenavWidth = $(sidenav).width();
- content.css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
-+ for(var i = 1; i <= 4;i++) {
-+ if(navrows[i] != null)
-+ navrows[i].css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
-+ navrows[i].css({width:windowWidth-parseInt(sidenavWidth) - 6 + "px"});
-+ }
-+
- writeCookie('width',sidenavWidth, null);
- }
-
- function restoreWidth(navWidth)
- {
-- var windowWidth = $(window).width() + "px";
-+ var windowWidth = $(window).width();
- content.css({marginLeft:parseInt(navWidth)+6+"px"});
- sidenav.css({width:navWidth + "px"});
-+ for(var i = 1; i <= 4;i++) {
-+ if(navrows[i] != null)
-+ navrows[i].css({marginLeft:parseInt(navWidth)+6+"px"});
-+ navrows[i].css({width:windowWidth-parseInt(navWidth) - 6 + "px"});
-+ }
- }
-
- function resizeHeight()
- {
- var headerHeight = header.height();
- var footerHeight = footer.height();
-+ var navrowsH = 0;
-+ for(var i = 1; i <= 4;i++) {
-+ if(navrows[i] != null)
-+ navrowsH = navrowsH + navrows[i].height();
-+ }
-+
- var windowHeight = $(window).height() - headerHeight - footerHeight;
-+ var treeH = windowHeight + navrowsH;
- content.css({height:windowHeight + "px"});
-- navtree.css({height:windowHeight + "px"});
-- sidenav.css({height:windowHeight + "px",top: headerHeight+"px"});
-+ navtree.css({height:treeH +"px"});
-+ sidenav.css({height:treeH +"px", top: headerHeight+"px"});
- }
-
- function initResizable()
-@@ -66,6 +85,10 @@
- content = $("#doc-content");
- navtree = $("#nav-tree");
- footer = $("#nav-path");
-+ for(var i = 1; i <= 4;i++) {
-+ navrows[i] = $("#navrow"+i);
-+ }
-+
- $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
- $(window).resize(function() { resizeHeight(); });
- var width = readCookie('width');
--- /dev/null
+--- libxml.h
++++ libxml.h
+@@ -13,6 +13,9 @@
+ #ifndef _LARGEFILE_SOURCE
+ #define _LARGEFILE_SOURCE
+ #endif
++#ifndef _LARGEFILE64_SOURCE
++#define _LARGEFILE64_SOURCE
++#endif
+ #ifndef _FILE_OFFSET_BITS
+ #define _FILE_OFFSET_BITS 64
+ #endif
+
+++ /dev/null
---- libxml.h
-+++ libxml.h
-@@ -13,6 +13,9 @@
- #ifndef _LARGEFILE_SOURCE
- #define _LARGEFILE_SOURCE
- #endif
-+#ifndef _LARGEFILE64_SOURCE
-+#define _LARGEFILE64_SOURCE
-+#endif
- #ifndef _FILE_OFFSET_BITS
- #define _FILE_OFFSET_BITS 64
- #endif
-
+++ /dev/null
---- CMakeLists.txt 2011-03-14 17:38:16.000000000 +0300
-+++ CMakeLists_new.txt 2011-03-14 17:38:57.000000000 +0300
-@@ -336,6 +336,12 @@
- ENDIF (PARAVIEW_BUILD_QT_GUI)
-
- ####################################################################################
-+# The ParaView library dependencies.
-+SET(PARAVIEW_LIBRARY_DEPENDS_FILE
-+ "${ParaView_BINARY_DIR}/ParaViewLibraryDepends.cmake")
-+EXPORT_LIBRARY_DEPENDENCIES(${PARAVIEW_LIBRARY_DEPENDS_FILE})
-+
-+####################################################################################
- # Export Targets file.
- SET(PARAVIEW_TARGETS_FILE "${CMAKE_BINARY_DIR}/${PV_INSTALL_EXPORT_NAME}.cmake")
-
+++ /dev/null
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeTools.cxx ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeTools.cxx
---- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeTools.cxx 2011-04-13 20:17:26.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeTools.cxx 2011-10-07 10:27:34.000000000 +0400
-@@ -31,6 +31,10 @@
- // The embedded fonts
- #include "fonts/vtkEmbeddedFonts.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+using namespace ftgl;
-+#endif
-+
- // Print debug info
- #define VTK_FTFC_DEBUG 0
- #define VTK_FTFC_DEBUG_CD 0
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.cxx ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.cxx
---- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.cxx 2011-04-13 20:17:26.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.cxx 2011-10-07 10:20:19.000000000 +0400
-@@ -33,6 +33,10 @@
-
- #include <sys/stat.h>
-
-+#ifdef FTGL_USE_NAMESPACE
-+using namespace ftgl;
-+#endif
-+
- // Print debug info
-
- #define VTK_FTFC_DEBUG 0
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.h ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.h
---- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.h 2011-04-13 20:17:26.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.h 2011-10-07 09:25:07.000000000 +0400
-@@ -32,6 +32,8 @@
-
- // FreeType
-
-+#include <FTGL.h>
-+
- #include "vtk_freetype.h" //since ft2build.h could be in the path
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
-@@ -42,7 +44,14 @@
- # define VTK_FREETYPE_CACHING_SUPPORTED
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
- class FTFont;
-+#ifdef FTGL_USE_NAMESPACE
-+}
-+#endif
-
- //----------------------------------------------------------------------------
- // Singleton cleanup
-@@ -243,7 +252,11 @@
- struct Entry
- {
- vtkTextProperty *TextProperty;
-+#ifdef FTGL_USE_NAMESPACE
-+ ftgl::FTFont *Font;
-+#else
- FTFont *Font;
-+#endif
- float LargestAscender;
- float LargestDescender;
- };
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx
---- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx 2011-04-13 20:17:26.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx 2011-10-07 10:35:15.000000000 +0400
-@@ -33,6 +33,9 @@
- #include "vtk_gl2ps.h"
- #endif // VTK_USE_GL2PS
-
-+#ifdef FTGL_USE_NAMESPACE
-+using namespace ftgl;
-+#endif
-
- //----------------------------------------------------------------------------
- // Print debug info
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h
---- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h 2011-04-13 20:17:26.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h 2011-10-07 11:17:46.000000000 +0400
-@@ -26,9 +26,18 @@
-
- #include "vtkTextMapper.h"
-
-+//#include <FTGL.h>
-+//
-+//#ifdef FTGL_USE_NAMESPACE
-+//namespace ftgl
-+//{
-+//#endif
- //BTX
--class FTFont;
-+//class FTFont;
- //ETX
-+//#ifdef FTGL_USE_NAMESPACE
-+//}
-+//#endif
-
- class VTK_RENDERING_EXPORT vtkOpenGLFreeTypeTextMapper : public vtkTextMapper
- {
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp 2011-10-06 20:28:22.000000000 +0400
-@@ -3,6 +3,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTBitmapGlyph::FTBitmapGlyph( FT_Glyph _glyph)
- : FTGlyph(),
-@@ -110,3 +114,7 @@
-
- return advance;
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.h 2011-10-06 20:28:50.000000000 +0400
-@@ -9,6 +9,10 @@
- #include "FTGL.h"
- #include "FTGlyph.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- /**
- * FTBitmapGlyph is a specialisation of FTGlyph for creating bitmaps.
-@@ -72,6 +76,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTBitmapGlyph__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp 2011-10-06 20:52:10.000000000 +0400
-@@ -8,6 +8,11 @@
- #define RenderFunctionName RenderOpenGL
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- void FTBitmapGlyph::RenderFunctionName(const FT_Vector& pen,
- const FTGLRenderContext *)
- {
-@@ -19,3 +24,7 @@
- // Restore the glyph origin
- glBitmap( 0, 0, 0.0, 0.0, (float)(-pen.x - pos.x), (float)(-pen.y + pos.y), (const GLubyte *)0 );
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.cpp 2011-10-06 20:29:58.000000000 +0400
-@@ -3,6 +3,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTCharmap::FTCharmap( FT_Face face)
- : ftFace( face),
-@@ -112,3 +116,7 @@
- }
- #endif
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.h 2011-10-06 20:29:38.000000000 +0400
-@@ -24,6 +24,11 @@
- #endif
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- /**
- * FTCharmap takes care of specifying the encoding for a font and mapping
- * character codes to glyph indices.
-@@ -134,5 +139,8 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTCharmap__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp 2011-10-06 20:30:45.000000000 +0400
-@@ -6,6 +6,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
- : FTGlyph(),
-@@ -234,3 +238,7 @@
-
- return advance;
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.h 2011-10-06 20:30:29.000000000 +0400
-@@ -9,6 +9,11 @@
- #include "FTGLgl.h"
- #include "FTGlyph.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTVectoriser;
-
- /**
-@@ -70,6 +75,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTExtrdGlyph__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.cpp 2011-10-06 20:31:28.000000000 +0400
-@@ -6,6 +6,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTFace::FTFace()
- : charMap(0),
-@@ -140,5 +144,6 @@
- }
- }
-
--
--
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.h 2011-10-06 20:31:11.000000000 +0400
-@@ -9,6 +9,11 @@
-
- #include "FTSize.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTCharmap;
-
- /**
-@@ -158,5 +163,8 @@
- FT_Error err;
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTFace__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.cpp 2011-10-06 20:32:15.000000000 +0400
-@@ -6,6 +6,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTFont::FTFont()
- : numFaces(0),
-@@ -287,3 +291,6 @@
- pen.y += kernAdvance.y;
- }
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.h 2011-10-06 20:32:19.000000000 +0400
-@@ -7,6 +7,11 @@
- #include "FTGL.h"
- #include "FTFace.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTGlyphContainer;
- class FTGlyph;
-
-@@ -273,6 +278,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTFont__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGL.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGL.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGL.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGL.h 2011-10-06 20:51:26.000000000 +0400
-@@ -5,6 +5,8 @@
- #include "vtkftglConfig.h"
- #endif
-
-+#define FTGL_USE_NAMESPACE
-+
- // To include debug memory manager by Paul Nettle (midnight@FluidStudios.com)
- // http://www.FluidStudios.com/publications.html
- // Get this code and use it. It will open your eyes:)
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp 2011-10-06 20:47:00.000000000 +0400
-@@ -4,6 +4,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTGLBitmapFont::FTGLBitmapFont()
- {}
-@@ -62,3 +66,7 @@
- this->RenderOpenGL(string, context);
- }
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.h 2011-10-06 20:33:27.000000000 +0400
-@@ -5,6 +5,11 @@
-
- #include "FTFont.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTGlyph;
-
- /**
-@@ -67,4 +72,8 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-+
- #endif // __FTGLBitmapFont__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp 2011-10-06 20:53:28.000000000 +0400
-@@ -9,6 +9,11 @@
- #define RenderFunctionName RenderOpenGL
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- void FTGLBitmapFont::RenderFunctionName(const char* string,
- const FTGLRenderContext *context)
- {
-@@ -44,3 +49,7 @@
- glPopAttrib();
- glPopClientAttrib();
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp 2011-10-06 20:47:04.000000000 +0400
-@@ -4,6 +4,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTGLExtrdFont::FTGLExtrdFont()
- : depth(0)
-@@ -28,4 +32,6 @@
- return NULL;
- }
-
--
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.h 2011-10-06 20:34:02.000000000 +0400
-@@ -5,6 +5,11 @@
-
- #include "FTFont.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTGlyph;
-
-
-@@ -42,6 +47,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTGLExtrdFont__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp 2011-10-06 20:34:27.000000000 +0400
-@@ -4,6 +4,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTGLOutlineFont::FTGLOutlineFont()
- {}
-@@ -63,3 +67,6 @@
-
- }
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.h 2011-10-06 20:34:31.000000000 +0400
-@@ -5,6 +5,11 @@
-
- #include "FTFont.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTGlyph;
-
-
-@@ -53,4 +58,9 @@
- virtual FTGlyph* MakeGlyph( unsigned int g);
-
- };
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-+
- #endif // __FTGLOutlineFont__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp 2011-10-06 20:50:30.000000000 +0400
-@@ -4,6 +4,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTGLPixmapFont::FTGLPixmapFont()
- {}
-@@ -60,3 +64,7 @@
- this->RenderOpenGL(string, context);
- }
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.h 2011-10-06 20:35:05.000000000 +0400
-@@ -6,6 +6,11 @@
-
- #include "FTFont.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTGlyph;
-
-
-@@ -68,5 +73,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-+
- #endif // __FTGLPixmapFont__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp 2011-10-06 20:56:22.000000000 +0400
-@@ -9,6 +9,11 @@
- #define RenderFunctionName RenderOpenGL
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- void FTGLPixmapFont::RenderFunctionName(const char* string,
- const FTGLRenderContext *context)
- {
-@@ -44,3 +49,7 @@
- glPopAttrib();
- glPopClientAttrib();
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp 2011-10-06 20:35:40.000000000 +0400
-@@ -4,6 +4,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTGLPolygonFont::FTGLPolygonFont()
- {}
-@@ -27,4 +31,6 @@
- return NULL;
- }
-
--
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.h 2011-10-06 20:35:44.000000000 +0400
-@@ -5,6 +5,11 @@
-
- #include "FTFont.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTGlyph;
-
-
-@@ -38,6 +43,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTGLPolygonFont__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp 2011-10-06 20:36:08.000000000 +0400
-@@ -4,6 +4,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- inline GLuint NextPowerOf2( GLuint in)
- {
-@@ -173,3 +177,6 @@
- glPopAttrib();
- }
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.h 2011-10-06 20:36:10.000000000 +0400
-@@ -5,6 +5,11 @@
- #include "FTGLgl.h"
- #include "FTFont.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTTextureGlyph;
-
-
-@@ -141,6 +146,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTGLTextureFont__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.cpp 2011-10-06 20:36:53.000000000 +0400
-@@ -3,6 +3,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTGlyph::FTGlyph()
- : advance(0),
-@@ -22,3 +26,7 @@
- FT_Done_Glyph( glyph );
- }
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.h 2011-10-06 20:36:57.000000000 +0400
-@@ -7,6 +7,10 @@
-
- #include "FTGL.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- /**
- * FTBBox
-@@ -142,6 +146,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTGlyph__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp 2011-10-06 20:42:17.000000000 +0400
-@@ -5,6 +5,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTGlyphContainer::FTGlyphContainer( FTFace* f, unsigned int g, bool p)
- : preCache( p),
-@@ -65,3 +69,7 @@
- // kernAdvance.y = advance.y + kernAdvance.y;
- return kernAdvance;
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.h 2011-10-06 20:42:13.000000000 +0400
-@@ -19,6 +19,11 @@
- #endif
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- /**
- * FTGlyphContainer holds the post processed FTGlyph objects.
- *
-@@ -142,5 +147,8 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTGlyphContainer__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.cpp 2011-10-06 20:42:45.000000000 +0400
-@@ -5,6 +5,11 @@
-
- #include <NoSTL/FTCallbackVector.h>
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- FTLibrary *FTLibrary::Instance = 0;
- FTLibraryCleanup FTLibrary::Cleanup;
- FTCallbackVector *FTLibraryCleanup::Dependencies = 0;
-@@ -152,3 +157,7 @@
-
- return true;
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.h 2011-10-06 20:42:54.000000000 +0400
-@@ -7,6 +7,10 @@
- #include FT_FREETYPE_H
- //#include FT_CACHE_H
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- /**
- * FTLibrary class is the global accessor for the Freetype library.
-@@ -114,4 +118,8 @@
- static FTLibrary* Instance;
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-+
- #endif // __FTLibrary__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp 2011-10-06 20:43:27.000000000 +0400
-@@ -4,6 +4,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTOutlineGlyph::FTOutlineGlyph( FT_Glyph glyph)
- : FTGlyph(),
-@@ -89,3 +93,6 @@
- return advance;
- }
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.h 2011-10-06 20:43:29.000000000 +0400
-@@ -9,8 +9,12 @@
- #include "FTGLgl.h"
- #include "FTGlyph.h"
-
--class FTVectoriser;
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
-+class FTVectoriser;
-
- /**
- * FTOutlineGlyph is a specialisation of FTGlyph for creating outlines.
-@@ -77,6 +81,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTOutlineGlyph__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp 2011-10-06 20:43:55.000000000 +0400
-@@ -3,6 +3,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTPixmapGlyph::FTPixmapGlyph( FT_Glyph _glyph)
- : FTGlyph(),
-@@ -157,3 +161,7 @@
-
- return advance;
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.h 2011-10-06 20:43:51.000000000 +0400
-@@ -9,6 +9,10 @@
- #include "FTGL.h"
- #include "FTGlyph.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- /**
- * FTPixmapGlyph is a specialisation of FTGlyph for creating pixmaps.
-@@ -77,4 +81,8 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-+
- #endif // __FTPixmapGlyph__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp 2011-10-06 20:58:01.000000000 +0400
-@@ -8,6 +8,11 @@
- #define GetCurrentColorFunctionName GetCurrentColorOpenGL
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- void FTPixmapGlyph::GetCurrentColorFunctionName(float colour[4],
- const FTGLRenderContext *)
- {
-@@ -29,3 +34,7 @@
- // Restore the glyph origin
- glBitmap( 0, 0, 0.0, 0.0, (float)(-pen.x - pos.x), (float)(-pen.y + pos.y), (const GLubyte *)0);
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp 2011-10-06 20:44:20.000000000 +0400
-@@ -4,6 +4,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTPolyGlyph::FTPolyGlyph( FT_Glyph glyph)
- : FTGlyph(),
-@@ -84,3 +88,7 @@
-
- return advance;
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.h 2011-10-06 20:44:22.000000000 +0400
-@@ -10,6 +10,11 @@
- #include "FTGLgl.h"
- #include "FTGlyph.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTVectoriser;
-
- /**
-@@ -75,6 +80,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTPolyGlyph__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.cpp 2011-10-06 20:45:03.000000000 +0400
-@@ -3,6 +3,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTSize::FTSize()
- : ftFace(0),
-@@ -91,3 +95,7 @@
- {
- return 0;
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.h 2011-10-06 20:45:06.000000000 +0400
-@@ -7,7 +7,10 @@
-
- #include "FTGL.h"
-
--
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- /**
- * FTSize class provides an abstraction layer for the Freetype Size.
-@@ -119,5 +122,9 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-+
- #endif // __FTSize__
-
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp 2011-10-06 20:45:28.000000000 +0400
-@@ -3,6 +3,10 @@
- #include "mmgr.h"
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- FTTextureGlyph::FTTextureGlyph( FT_Glyph glyph, int id, int xOffset, int yOffset, GLsizei width, GLsizei height)
- : FTGlyph(),
-@@ -109,3 +113,6 @@
-
- }
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.h 2011-10-06 20:45:30.000000000 +0400
-@@ -10,6 +10,10 @@
- #include "FTGLgl.h"
- #include "FTGlyph.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-
- /**
- * FTTextureGlyph is a specialisation of FTGlyph for creating texture
-@@ -101,5 +105,8 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTTextureGlyph__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.cpp
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.cpp 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.cpp 2011-10-06 20:46:20.000000000 +0400
-@@ -47,6 +47,11 @@
-
- } // End of extern C
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- //=============================================================================
-
- bool operator == ( const ftPoint &a, const ftPoint &b)
-@@ -419,3 +424,7 @@
- }
-
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.h 2011-10-06 20:45:52.000000000 +0400
-@@ -13,6 +13,11 @@
- #define CALLBACK
- #endif
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- /**
- * ftPoint class is a basic 3 dimensional point for holding outline font
- * point data.
-@@ -423,5 +428,8 @@
-
- };
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-
- #endif // __FTVectoriser__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h 2011-10-06 20:55:06.000000000 +0400
-@@ -23,6 +23,11 @@
-
- #include "FTGL.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTGL_EXPORT FTCharToGlyphIndexMap
- {
- public:
-@@ -150,4 +155,8 @@
- this->Indices[pos.quot][pos.rem] = g;
- }
-
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
-+
- #endif // __FTCharToGlyphIndexMap__
-diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTVector.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTVector.h
---- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTVector.h 2011-04-13 20:17:27.000000000 +0400
-+++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTVector.h 2011-10-06 20:55:47.000000000 +0400
-@@ -16,6 +16,11 @@
-
- #include "FTGL.h"
-
-+#ifdef FTGL_USE_NAMESPACE
-+namespace ftgl
-+{
-+#endif
-+
- class FTGL_EXPORT FT_VECTOR_CLASS_NAME
- {
- public:
-@@ -285,3 +290,7 @@
- }
- this->Size = n;
- }
-+
-+#ifdef FTGL_USE_NAMESPACE
-+} // namespace ftgl
-+#endif
+++ /dev/null
---- ParaView-3.14.0_SRC/CMakeLists.txt.orig 2012-04-09 16:27:29.000000000 +0400
-+++ ParaView-3.14.0_SRC/CMakeLists.txt 2012-04-09 16:29:55.000000000 +0400
-@@ -409,6 +409,11 @@
- ${ParaView_CMAKE_DIR}/branded_paraview_initializer.h.in
- ${ParaView_CMAKE_DIR}/ParaViewCPackOptions.cmake.in
- ${ParaView_CMAKE_DIR}/pv-forward.c.in
-+ ${ParaView_CMAKE_DIR}/generate_proxydocumentation.cmake
-+ ${ParaView_CMAKE_DIR}/smxml_to_xml.xsl
-+ ${ParaView_CMAKE_DIR}/xml_to_html.xsl
-+ ${ParaView_CMAKE_DIR}/xml_to_wiki.xsl.in
-+ ${ParaView_CMAKE_DIR}/generate_qhp.cmake
- # originaly from Qt/Components
- ${ParaView_CMAKE_DIR}/pqObjectPanelImplementation.h.in
- ${ParaView_CMAKE_DIR}/pqObjectPanelImplementation.cxx.in
