OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

0024635: Eliminate trivial compiler warnings by GCC in Debug mode

Browse Source
This commit is contained in:
abv 2014-02-14 16:03:01 +04:00 committed by apn
parent 03e04ead37
commit 1896126e35
18 changed files with 98 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/BRepFill/BRepFill_Evolved.cxx
View File

@ -126,9 +126,6 @@
#include <DBRep.hxx> #include <DBRep.hxx>
#include <DrawTrSurf.hxx> #include <DrawTrSurf.hxx>
#include <stdio.h> #include <stdio.h>
#endif
#ifdef DEB
static Standard_Boolean AffichGeom = Standard_False; static Standard_Boolean AffichGeom = Standard_False;
static Standard_Boolean AffichEdge = Standard_False; static Standard_Boolean AffichEdge = Standard_False;
static Standard_Integer NbFACES = 0; static Standard_Integer NbFACES = 0;
@ -136,10 +133,6 @@ static Standard_Integer NbTRIMFACES = 0;
static Standard_Integer NbVEVOS = 0; static Standard_Integer NbVEVOS = 0;
static Standard_Integer NbPROFILS = 0; static Standard_Integer NbPROFILS = 0;
static Standard_Integer NbEDGES = 0; static Standard_Integer NbEDGES = 0;
// POP for NT
#ifndef WNT
static char name[100];
#endif
#endif #endif
static const Standard_Real BRepFill_Confusion() static const Standard_Real BRepFill_Confusion()
@ -687,6 +680,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp,
#ifdef DRAW #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
char name[100];
sprintf(name,"PROFIL_%d",++NbPROFILS); sprintf(name,"PROFIL_%d",++NbPROFILS);
DBRep::Set(name,Pr); DBRep::Set(name,Pr);
} }
@ -984,6 +978,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp,
#ifdef DRAW #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
char name[100];
sprintf(name,"ARCEDGE_%d_%d_%d",i,vv,Ti); sprintf(name,"ARCEDGE_%d_%d_%d",i,vv,Ti);
DBRep::Set(name,CurrentEdge); DBRep::Set(name,CurrentEdge);
} }
@ -1069,7 +1064,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp,
} }
} }
#ifdef DEB #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
cout << " End of Construction of edges and vertices on bissectrices"<<endl; cout << " End of Construction of edges and vertices on bissectrices"<<endl;
} }
@ -1134,6 +1129,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp,
#ifdef DRAW #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
char name[100];
sprintf(name,"PAREDGE_%d_%d",++NbEDGES,k); sprintf(name,"PAREDGE_%d_%d",++NbEDGES,k);
DBRep::Set(name,S.Value(k)); DBRep::Set(name,S.Value(k));
} }
@ -1171,6 +1167,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp,
#ifdef DRAW #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
char name[100];
sprintf(name,"PAREDGE_%d_%d",++NbEDGES,k); sprintf(name,"PAREDGE_%d_%d",++NbEDGES,k);
DBRep::Set(name,S.Value(k)); DBRep::Set(name,S.Value(k));
} }
@ -1254,6 +1251,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp,
#ifdef DRAW #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
cout <<" End of construction of an elementary volevo."<<endl; cout <<" End of construction of an elementary volevo."<<endl;
char name[100];
sprintf(name,"VEVO_%d",++NbVEVOS); sprintf(name,"VEVO_%d",++NbVEVOS);
DBRep::Set(name,myShape); DBRep::Set(name,myShape);
} }
@ -1360,6 +1358,7 @@ void BRepFill_Evolved::PlanarPerform (const TopoDS_Face& Sp,
TopTools_DataMapIteratorOfDataMapOfShapeShape it(MapVP); TopTools_DataMapIteratorOfDataMapOfShapeShape it(MapVP);
Standard_Integer k = 0; Standard_Integer k = 0;
for (; it.More(); it.Next()) { for (; it.More(); it.Next()) {
char name[100];
sprintf(name,"PARALI_%d",++k); sprintf(name,"PARALI_%d",++k);
DBRep::Set(name,it.Value()); DBRep::Set(name,it.Value());
} }
@ -1463,6 +1462,7 @@ void BRepFill_Evolved::VerticalPerform (const TopoDS_Face& Sp,
#ifdef DRAW #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
char name[100];
sprintf(name,"PARALI_%d",++NbVEVOS); sprintf(name,"PARALI_%d",++NbVEVOS);
DBRep::Set(name,Base); DBRep::Set(name,Base);
} }
@ -1471,6 +1471,7 @@ void BRepFill_Evolved::VerticalPerform (const TopoDS_Face& Sp,
BRepSweep_Prism PS(Base,gp_Vec(0,0,Alt2 - Alt1),Standard_False); BRepSweep_Prism PS(Base,gp_Vec(0,0,Alt2 - Alt1),Standard_False);
#ifdef DRAW #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
char name[100];
sprintf(name,"PRISM_%d",NbVEVOS); sprintf(name,"PRISM_%d",NbVEVOS);
DBRep::Set(name,PS.Shape()); DBRep::Set(name,PS.Shape());
} }
@ -1732,6 +1733,7 @@ const
#ifdef DRAW #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
char name[100];
sprintf(name,"workspine"); sprintf(name,"workspine");
DBRep::Set(name,WorkSpine); DBRep::Set(name,WorkSpine);
} }
@ -2214,6 +2216,7 @@ void BRepFill_Evolved::MakePipe(const TopoDS_Edge& SE,
#ifdef DRAW #ifdef DRAW
if (AffichGeom) { if (AffichGeom) {
char name[100];
sprintf(name,"EVOLBASE_%d",++NbFACES); sprintf(name,"EVOLBASE_%d",++NbFACES);
DBRep::Set(name,SE); DBRep::Set(name,SE);
sprintf(name,"EVOLPROF_%d",NbFACES); sprintf(name,"EVOLPROF_%d",NbFACES);
@ -2226,6 +2229,7 @@ void BRepFill_Evolved::MakePipe(const TopoDS_Edge& SE,
#ifdef DRAW #ifdef DRAW
if (AffichGeom) { if (AffichGeom) {
char name[100];
sprintf(name,"EVOL_%d",++NbFACES); sprintf(name,"EVOL_%d",++NbFACES);
DBRep::Set(name,Pipe.Shape()); DBRep::Set(name,Pipe.Shape());
} }
@ -2303,9 +2307,9 @@ void BRepFill_Evolved::MakeRevol(const TopoDS_Edge& SE,
#ifdef DRAW #ifdef DRAW
if (AffichGeom) { if (AffichGeom) {
char name[100];
sprintf(name,"EVOLBASE_%d",++NbFACES); sprintf(name,"EVOLBASE_%d",++NbFACES);
char* Temp = name ; DrawTrSurf::Set(name,new Geom_Line(AxeRev));
DrawTrSurf::Set(Temp,new Geom_Line(AxeRev));
// DrawTrSurf::Set(name,new Geom_Line(AxeRev)); // DrawTrSurf::Set(name,new Geom_Line(AxeRev));
sprintf(name,"EVOLPROF_%d",NbFACES); sprintf(name,"EVOLPROF_%d",NbFACES);
DBRep::Set(name,GenProf); DBRep::Set(name,GenProf);
@ -2407,6 +2411,7 @@ void BRepFill_Evolved::TransformInitWork(const TopLoc_Location& LS,
#ifdef DRAW #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
char name[100];
sprintf(name,"movedspine"); sprintf(name,"movedspine");
TopoDS_Face SL = mySpine; TopoDS_Face SL = mySpine;
DBRep::Set(name,SL); DBRep::Set(name,SL);

8
src/BRepFill/BRepFill_MultiLine.cxx
View File

@ -47,12 +47,10 @@
#ifdef DRAW #ifdef DRAW
#include <DrawTrSurf.hxx> #include <DrawTrSurf.hxx>
#endif
#ifdef DEB
static Standard_Boolean AffichCurve = Standard_False; static Standard_Boolean AffichCurve = Standard_False;
static Standard_Integer NbProj = 1; static Standard_Integer NbProj = 1;
#endif #endif
//POP pour NT //POP pour NT
#include <stdio.h> #include <stdio.h>
@ -506,9 +504,7 @@ void BRepFill_MultiLine::Curves(Handle(Geom_Curve)& Curve,
#ifdef DRAW #ifdef DRAW
if ( AffichCurve) { if ( AffichCurve) {
//POP pour NT char name[100];
// char name[100];
char* name = new char[100];
sprintf(name,"C2_%d",NbProj); sprintf(name,"C2_%d",NbProj);
DrawTrSurf::Set(name,TLine); DrawTrSurf::Set(name,TLine);
sprintf(name,"C3_%d",NbProj); sprintf(name,"C3_%d",NbProj);

21
src/BRepFill/BRepFill_OffsetWire.cxx
View File

@ -105,9 +105,6 @@
#include <DrawTrSurf.hxx> #include <DrawTrSurf.hxx>
#include <DrawTrSurf_Curve2d.hxx> #include <DrawTrSurf_Curve2d.hxx>
#include <DBRep.hxx> #include <DBRep.hxx>
#endif
#ifdef DEB
static Standard_Boolean AffichGeom = Standard_False; static Standard_Boolean AffichGeom = Standard_False;
static Standard_Boolean Affich2d = Standard_False; static Standard_Boolean Affich2d = Standard_False;
static Standard_Boolean AffichEdge = Standard_False; static Standard_Boolean AffichEdge = Standard_False;
@ -115,10 +112,6 @@ static Standard_Integer NbTRIMEDGES = 0;
static Standard_Integer NbOFFSET = 0; static Standard_Integer NbOFFSET = 0;
static Standard_Integer NbEDGES = 0; static Standard_Integer NbEDGES = 0;
static Standard_Integer NbBISSEC = 0; static Standard_Integer NbBISSEC = 0;
#ifndef WNT
static char tname[100];
static Standard_CString name = tname ;
#endif
#endif #endif
// Modified by Sergey KHROMOV - Thu Nov 16 17:24:39 2000 Begin // Modified by Sergey KHROMOV - Thu Nov 16 17:24:39 2000 Begin
@ -602,8 +595,6 @@ void BRepFill_OffsetWire::Perform (const Standard_Real Offset,
if(aSubst.IsCopied(myWorkSpine)) { if(aSubst.IsCopied(myWorkSpine)) {
myWorkSpine = TopoDS::Face(aSubst.Copy(myWorkSpine).First()); myWorkSpine = TopoDS::Face(aSubst.Copy(myWorkSpine).First());
//sprintf(name,"WS1");
//DBRep::Set(name,myWorkSpine);
BRepMAT2d_Explorer newExp; BRepMAT2d_Explorer newExp;
newExp.Perform(myWorkSpine); newExp.Perform(myWorkSpine);
@ -788,7 +779,7 @@ void BRepFill_OffsetWire::PerformWithBiLo
} }
#ifdef DEB #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
cout << " End Construction of geometric primitives "<<endl; cout << " End Construction of geometric primitives "<<endl;
} }
@ -816,6 +807,7 @@ void BRepFill_OffsetWire::PerformWithBiLo
#ifdef DRAW #ifdef DRAW
if ( AffichGeom) { if ( AffichGeom) {
char name[256];
sprintf(name,"BISSEC_%d",NbBISSEC++); sprintf(name,"BISSEC_%d",NbBISSEC++);
DrawTrSurf::Set(name,Bisec.Value()); DrawTrSurf::Set(name,Bisec.Value());
} }
@ -967,7 +959,7 @@ void BRepFill_OffsetWire::PerformWithBiLo
} }
} }
#ifdef DEB #ifdef DRAW
if (AffichEdge) { if (AffichEdge) {
cout << " End Construction of vertices on offsets"<<endl; cout << " End Construction of vertices on offsets"<<endl;
} }
@ -1192,8 +1184,7 @@ void BRepFill_OffsetWire::PrepareSpine()
#ifdef DRAW #ifdef DRAW
if ( AffichEdge) { if ( AffichEdge) {
sprintf(name,"WS"); DBRep::Set("WS",myWorkSpine);
DBRep::Set(name,myWorkSpine);
} }
#endif #endif
@ -1825,6 +1816,7 @@ void MakeCircle (const TopoDS_Edge& E,
#ifdef DRAW #ifdef DRAW
if ( AffichGeom && !OE.IsNull()) { if ( AffichGeom && !OE.IsNull()) {
char name[256];
sprintf(name,"OFFSET_%d",++NbOFFSET); sprintf(name,"OFFSET_%d",++NbOFFSET);
DBRep::Set(name,OE); DBRep::Set(name,OE);
} }
@ -1901,6 +1893,7 @@ void MakeOffset (const TopoDS_Edge& E,
#ifdef DRAW #ifdef DRAW
if (AffichGeom && !OE.IsNull()) { if (AffichGeom && !OE.IsNull()) {
char name[256];
sprintf(name,"OFFSET_%d",++NbOFFSET); sprintf(name,"OFFSET_%d",++NbOFFSET);
DBRep::Set(name,OE); DBRep::Set(name,OE);
Standard_Real ii = 0; Standard_Real ii = 0;
@ -2143,6 +2136,7 @@ void TrimEdge (const TopoDS_Edge& E,
#ifdef DRAW #ifdef DRAW
if ( AffichEdge) { if ( AffichEdge) {
char name[256];
sprintf(name,"TRIMEDGE_%d",NbTRIMEDGES); sprintf(name,"TRIMEDGE_%d",NbTRIMEDGES);
DBRep::Set(name,NewEdge); DBRep::Set(name,NewEdge);
} }
@ -2152,6 +2146,7 @@ void TrimEdge (const TopoDS_Edge& E,
Handle(Geom_Surface) Surf; Handle(Geom_Surface) Surf;
Handle(Geom2d_Curve) C; Handle(Geom2d_Curve) C;
BRep_Tool::CurveOnSurface(NewEdge,C,Surf,L,f,l); BRep_Tool::CurveOnSurface(NewEdge,C,Surf,L,f,l);
char name[256];
sprintf(name,"OFFSET2d_%d",NbTRIMEDGES++); sprintf(name,"OFFSET2d_%d",NbTRIMEDGES++);
Handle(Geom2d_TrimmedCurve) C2d = new Geom2d_TrimmedCurve(C,f,l); Handle(Geom2d_TrimmedCurve) C2d = new Geom2d_TrimmedCurve(C,f,l);
Handle(DrawTrSurf_Curve2d) dr = Handle(DrawTrSurf_Curve2d) dr =

32
src/BRepOffset/BRepOffset_Inter2d.cxx
View File

@ -46,20 +46,6 @@
#include <BRep_CurveRepresentation.hxx> #include <BRep_CurveRepresentation.hxx>
#include <BRep_GCurve.hxx> #include <BRep_GCurve.hxx>
#ifdef DRAW
#include <DBRep.hxx>
#endif
#ifdef DEB
#ifndef WNT
extern Standard_Integer AffichInt2d;
#else
Standard_IMPORT Standard_Boolean AffichInt2d;
#endif
static Standard_Integer NbF2d = 0;
static Standard_Integer NbE2d = 0;
static Standard_Integer NbNewVertices = 0;
#endif
#include <Geom_Line.hxx> #include <Geom_Line.hxx>
#include <Geom_TrimmedCurve.hxx> #include <Geom_TrimmedCurve.hxx>
#include <GeomConvert_CompCurveToBSplineCurve.hxx> #include <GeomConvert_CompCurveToBSplineCurve.hxx>
@ -94,6 +80,13 @@ static Standard_Integer NbNewVertices = 0;
#include <BndLib_Add3dCurve.hxx> #include <BndLib_Add3dCurve.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
#ifdef DRAW
#include <DBRep.hxx>
Standard_IMPORT extern Standard_Boolean AffichInt2d;
static Standard_Integer NbF2d = 0;
static Standard_Integer NbE2d = 0;
static Standard_Integer NbNewVertices = 0;
#endif
//======================================================================= //=======================================================================
//function : CommonVertex //function : CommonVertex
@ -253,8 +246,7 @@ static void Store (const TopoDS_Edge& E1,
#ifdef DRAW #ifdef DRAW
if (AffichInt2d) { if (AffichInt2d) {
if (!OnE1 && !OnE2) { if (!OnE1 && !OnE2) {
//POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"VV_%d",NbNewVertices++); sprintf(name,"VV_%d",NbNewVertices++);
DBRep::Set(name,V); DBRep::Set(name,V);
} }
@ -280,8 +272,7 @@ static void EdgeInter(const TopoDS_Face& F,
{ {
#ifdef DRAW #ifdef DRAW
if (AffichInt2d) { if (AffichInt2d) {
//POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++); sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++);
DBRep::Set(name,E1); DBRep::Set(name,E1);
sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++); sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++);
@ -552,8 +543,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
{ {
#ifdef DRAW #ifdef DRAW
if (AffichInt2d) { if (AffichInt2d) {
//POP for NT char name[256];
char* name = new char[100];
sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++); sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++);
DBRep::Set(name,E1); DBRep::Set(name,E1);
sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++); sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++);
@ -1410,7 +1400,7 @@ void BRepOffset_Inter2d::Compute (const Handle(BRepAlgo_AsDes)& AsDes,
const TopTools_IndexedMapOfShape& NewEdges, const TopTools_IndexedMapOfShape& NewEdges,
const Standard_Real Tol) const Standard_Real Tol)
{ {
#ifdef DEB #ifdef DRAW
NbF2d++; NbF2d++;
NbE2d = 0; NbE2d = 0;
#endif #endif

8
src/BRepOffset/BRepOffset_MakeLoops.cxx
View File

@ -35,15 +35,10 @@
#ifdef DRAW #ifdef DRAW
#include <DBRep.hxx> #include <DBRep.hxx>
#endif
#ifdef DEB
Standard_Integer NbF = 1; Standard_Integer NbF = 1;
static Standard_Boolean Affich = Standard_False; static Standard_Boolean Affich = Standard_False;
//POP pour NT
//char name[100];
#endif #endif
BRepOffset_MakeLoops::BRepOffset_MakeLoops() BRepOffset_MakeLoops::BRepOffset_MakeLoops()
{ {
} }
@ -444,9 +439,8 @@ void BRepOffset_MakeLoops::BuildFaces(const TopTools_ListOfShape& LF,
} }
if (ToRebuild) { if (ToRebuild) {
#ifdef DRAW #ifdef DRAW
//POP for NT
if ( Affich) { if ( Affich) {
char* name = new char[100]; char name[256];
sprintf(name,"CF_%d",NbF++); sprintf(name,"CF_%d",NbF++);
DBRep::Set(name,F); DBRep::Set(name,F);
} }

42
src/BRepOffset/BRepOffset_Tool.cxx
View File

@ -143,20 +143,17 @@
#ifdef DRAW #ifdef DRAW
#include <DBRep.hxx> #include <DBRep.hxx>
#endif
#ifdef DEB
Standard_Boolean AffichInter = Standard_False; Standard_Boolean AffichInter = Standard_False;
static Standard_Boolean AffichExtent = Standard_False;
static Standard_Integer NbNewEdges = 1; static Standard_Integer NbNewEdges = 1;
static Standard_Integer NbFaces = 1; static Standard_Integer NbFaces = 1;
static Standard_Integer NbFOB = 1; static Standard_Integer NbFOB = 1;
static Standard_Integer NbFTE = 1; static Standard_Integer NbFTE = 1;
static Standard_Integer NbExtE = 1; static Standard_Integer NbExtE = 1;
//POP pour NT
//char* name = new char[100];
#endif #endif
#ifdef DEB
static Standard_Boolean AffichExtent = Standard_False;
#endif
//======================================================================= //=======================================================================
//function : EdgeVertices //function : EdgeVertices
@ -730,8 +727,7 @@ void BRepOffset_Tool::PipeInter(const TopoDS_Face& F1,
{ {
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
// POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"FF_%d",NbFaces++); sprintf(name,"FF_%d",NbFaces++);
DBRep::Set(name,F1); DBRep::Set(name,F1);
sprintf(name,"FF_%d",NbFaces++); sprintf(name,"FF_%d",NbFaces++);
@ -779,8 +775,7 @@ void BRepOffset_Tool::PipeInter(const TopoDS_Face& F1,
L2.Append (E.Oriented(O2)); L2.Append (E.Oriented(O2));
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
// POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"EI_%d",NbNewEdges++); sprintf(name,"EI_%d",NbNewEdges++);
DBRep::Set(name,E.Oriented(O1)); DBRep::Set(name,E.Oriented(O1));
} }
@ -1572,8 +1567,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
{ {
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
// POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"FF_%d",NbFaces++); sprintf(name,"FF_%d",NbFaces++);
DBRep::Set(name,F1); DBRep::Set(name,F1);
sprintf(name,"FF_%d",NbFaces++); sprintf(name,"FF_%d",NbFaces++);
@ -1695,7 +1689,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
char* name = new char[100]; char name[256];
sprintf(name,"EI_%d",NbNewEdges++); sprintf(name,"EI_%d",NbNewEdges++);
DBRep::Set(name,anEdge.Oriented(O1)); DBRep::Set(name,anEdge.Oriented(O1));
@ -1943,8 +1937,7 @@ Standard_Boolean BRepOffset_Tool::TryProject
{ {
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
// POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"FF_%d",NbFaces++); sprintf(name,"FF_%d",NbFaces++);
DBRep::Set(name,F1); DBRep::Set(name,F1);
sprintf(name,"FF_%d",NbFaces++); sprintf(name,"FF_%d",NbFaces++);
@ -1987,9 +1980,8 @@ Standard_Boolean BRepOffset_Tool::TryProject
LInt2.Append (CurE.Oriented(O2)); LInt2.Append (CurE.Oriented(O2));
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
// POP pour NT char name[256];
char* name = new char[100]; sprintf(name,"EI_%d",NbNewEdges++);
sprintf(name,"EI_%d",NbNewEdges++);
DBRep::Set(name,CurE.Oriented(O1)); DBRep::Set(name,CurE.Oriented(O1));
} }
#endif #endif
@ -2014,8 +2006,7 @@ void BRepOffset_Tool::InterOrExtent(const TopoDS_Face& F1,
{ {
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
// POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"FF_%d",NbFaces++); sprintf(name,"FF_%d",NbFaces++);
DBRep::Set(name,F1); DBRep::Set(name,F1);
sprintf(name,"FF_%d",NbFaces++); sprintf(name,"FF_%d",NbFaces++);
@ -2064,8 +2055,7 @@ void BRepOffset_Tool::InterOrExtent(const TopoDS_Face& F1,
L2.Append (E.Oriented(O2)); L2.Append (E.Oriented(O2));
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
// POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"EI_%d",NbNewEdges++); sprintf(name,"EI_%d",NbNewEdges++);
DBRep::Set(name,E.Oriented(O1)); DBRep::Set(name,E.Oriented(O1));
} }
@ -2153,7 +2143,7 @@ static void ExtentEdge(const TopoDS_Face& F,
NE.Orientation(E.Orientation()); NE.Orientation(E.Orientation());
#ifdef DRAW #ifdef DRAW
if (AffichExtent) { if (AffichExtent) {
char* name = new char[100]; char name[256];
sprintf (name,"F_%d",NbExtE); sprintf (name,"F_%d",NbExtE);
DBRep::Set(name,EF); DBRep::Set(name,EF);
sprintf (name,"OE_%d",NbExtE); sprintf (name,"OE_%d",NbExtE);
@ -3467,8 +3457,7 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face& F,
{ {
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
// POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"FTE_%d",NbFTE++); sprintf(name,"FTE_%d",NbFTE++);
DBRep::Set(name,F); DBRep::Set(name,F);
} }
@ -3886,8 +3875,7 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face& F,
#ifdef DRAW #ifdef DRAW
if (AffichInter) { if (AffichInter) {
// POP pour NT char name[256];
char* name = new char[100];
sprintf(name,"FOB_%d",NbFOB++); sprintf(name,"FOB_%d",NbFOB++);
DBRep::Set(name,NF); DBRep::Set(name,NF);
} }

2
src/Bisector/Bisector_Inter.cxx
View File

@ -38,8 +38,6 @@
#include <Draw_Appli.hxx> #include <Draw_Appli.hxx>
#include <DrawTrSurf_Curve2d.hxx> #include <DrawTrSurf_Curve2d.hxx>
#include <Draw_Marker2D.hxx> #include <Draw_Marker2D.hxx>
#endif
#ifdef DEB
static Standard_Boolean Affich = Standard_False; static Standard_Boolean Affich = Standard_False;
#endif #endif

3
src/Blend/Blend_CSWalking_4.gxx
View File

@ -265,10 +265,9 @@ void Blend_CSWalking::InternalPerform(Blend_CSFunction& Func,
Arrive = Standard_True; Arrive = Standard_True;
} }
break; break;
#ifndef DEB
default: default:
break; break;
#endif
} }
if (Arrive) { if (Arrive) {
if (sens > 0.) { if (sens > 0.) {

2
src/Expr/Expr_BinaryExpression.cxx
View File

@ -74,9 +74,7 @@ const Handle(Expr_GeneralExpression)& Expr_BinaryExpression::SubExpression (cons
Standard_OutOfRange::Raise(); Standard_OutOfRange::Raise();
} }
} }
#if defined (WNT) || !defined (DEB)
return *( ( Handle_Expr_GeneralExpression* )NULL ); return *( ( Handle_Expr_GeneralExpression* )NULL );
#endif // WNT || !DEB
} }
Standard_Boolean Expr_BinaryExpression::ContainsUnknowns () const Standard_Boolean Expr_BinaryExpression::ContainsUnknowns () const

7
src/Extrema/Extrema_ExtCS.cxx
View File

@ -130,6 +130,7 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C,
case GeomAbs_BSplineSurface: case GeomAbs_BSplineSurface:
case GeomAbs_SurfaceOfRevolution: case GeomAbs_SurfaceOfRevolution:
case GeomAbs_SurfaceOfExtrusion: case GeomAbs_SurfaceOfExtrusion:
case GeomAbs_OffsetSurface:
case GeomAbs_OtherSurface: case GeomAbs_OtherSurface:
{ {
Standard_Real cfirst = myucinf, clast = myucsup; Standard_Real cfirst = myucinf, clast = myucsup;
@ -139,7 +140,7 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C,
if(Precision::IsInfinite(Abs(cfirst)) || Precision::IsInfinite(Abs(clast))) { if(Precision::IsInfinite(Abs(cfirst)) || Precision::IsInfinite(Abs(clast))) {
Bnd_Box aSurfBox; Bnd_Box aSurfBox;
BndLib_AddSurface::Add(*myS, ufirst, ulast, vfirst, vlast, Precision::Confusion(), aSurfBox); BndLib_AddSurface::Add(*myS, ufirst, ulast, vfirst, vlast, Precision::Confusion(), aSurfBox);
Standard_Real xmin, ymin, zmin, xmax, ymax, zmax; Standard_Real xmin, ymin, zmin, xmax, ymax, zmax;
aSurfBox.Get(xmin, ymin, zmin, xmax, ymax, zmax); aSurfBox.Get(xmin, ymin, zmin, xmax, ymax, zmax);
Standard_Real tmin = Precision::Infinite(), tmax = -tmin; Standard_Real tmin = Precision::Infinite(), tmax = -tmin;
@ -207,10 +208,6 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C,
return; return;
} }
#ifndef DEB
default:
#endif
break;
} }
break; break;
} }

11
src/GeomFill/GeomFill_SweepSectionGenerator.cxx
View File

@ -38,11 +38,10 @@
#ifdef DRAW #ifdef DRAW
#include <DrawTrSurf.hxx> #include <DrawTrSurf.hxx>
#endif
#ifdef DEB
static Standard_Boolean Affich = Standard_False; static Standard_Boolean Affich = Standard_False;
static Standard_Integer NbSECTIONS = 0; static Standard_Integer NbSECTIONS = 0;
#endif #endif
//#define GF_DEB //#define GF_DEB
//======================================================================= //=======================================================================
//function : GeomFill_SweepSectionGenerator //function : GeomFill_SweepSectionGenerator
@ -580,9 +579,7 @@ void GeomFill_SweepSectionGenerator::Section
} }
#ifdef DRAW #ifdef DRAW
if ( Affich) { if ( Affich) {
//POP pour NT char name[256];
// char name[100];
char* name = new char[100];
sprintf(name,"SECTION_%d",++NbSECTIONS); sprintf(name,"SECTION_%d",++NbSECTIONS);
DrawTrSurf::Set(name,myFirstSect->Transformed(cumulTR)); DrawTrSurf::Set(name,myFirstSect->Transformed(cumulTR));
} }
@ -651,9 +648,7 @@ void GeomFill_SweepSectionGenerator::Section
#ifdef DRAW #ifdef DRAW
if ( Affich) { if ( Affich) {
// POP pour NT char name[256];
// char name[100];
char* name = new char[100];
sprintf(name,"SECTION_%d",++NbSECTIONS); sprintf(name,"SECTION_%d",++NbSECTIONS);
DrawTrSurf::Set(name,BS); DrawTrSurf::Set(name,BS);
} }

49
src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
View File

@ -69,10 +69,23 @@
#include <Geom2d_BezierCurve.hxx> #include <Geom2d_BezierCurve.hxx>
#include <TColgp_Array1OfPnt2d.hxx> #include <TColgp_Array1OfPnt2d.hxx>
// pour mes tests #include <TColStd_SequenceOfInteger.hxx>
#ifdef DEB #include <TColgp_SequenceOfVec.hxx>
#include <OSD_Chronometer.hxx> #include <TColgp_HArray2OfPnt.hxx>
#include <Geom_BSplineSurface.hxx>
#include <GeomPlate_SequenceOfAij.hxx>
#include <GeomPlate_MakeApprox.hxx>
// pour mes tests
#ifdef PLATE_DEB
#include <OSD_Chronometer.hxx>
#endif
#ifdef DRAW
#include <DrawTrSurf.hxx>
#include <Draw_Marker3D.hxx>
#include <Draw_Marker2D.hxx>
#include <Draw.hxx>
static Standard_Integer Affich=0; static Standard_Integer Affich=0;
// 0 : Pas de display // 0 : Pas de display
// 1 : Display des Geometries et controle intermediaire // 1 : Display des Geometries et controle intermediaire
@ -84,21 +97,6 @@ static Standard_Integer NbMark = 0;
static Standard_Integer NbProj = 0; static Standard_Integer NbProj = 0;
#endif #endif
#ifdef DRAW
#include <DrawTrSurf.hxx>
#include <Draw_Marker3D.hxx>
#include <Draw_Marker2D.hxx>
#include <Draw.hxx>
#endif
#include <TColStd_SequenceOfInteger.hxx>
#include <TColgp_SequenceOfVec.hxx>
#include <TColgp_HArray2OfPnt.hxx>
#include <Geom_BSplineSurface.hxx>
#include <GeomPlate_SequenceOfAij.hxx>
#include <GeomPlate_MakeApprox.hxx>
//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\// //\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
// ========================================================= // =========================================================
// C O N S T R U C T E U R S // C O N S T R U C T E U R S
@ -315,7 +313,7 @@ Handle(Geom2d_Curve) GeomPlate_BuildPlateSurface::ProjectCurve(const Handle(Ada
} }
#if DRAW #if DRAW
if (Affich) { if (Affich) {
char* name = new char[100]; char name[256];
sprintf(name,"proj_%d",++NbProj); sprintf(name,"proj_%d",++NbProj);
DrawTrSurf::Set(name, Curve2d); DrawTrSurf::Set(name, Curve2d);
} }
@ -457,7 +455,7 @@ void GeomPlate_BuildPlateSurface::
//--------------------------------------------------------- //---------------------------------------------------------
void GeomPlate_BuildPlateSurface::Perform() void GeomPlate_BuildPlateSurface::Perform()
{ {
#ifdef DEB #ifdef PLATE_DEB
// Chronmetrage // Chronmetrage
OSD_Chronometer Chrono; OSD_Chronometer Chrono;
Chrono.Reset(); Chrono.Reset();
@ -1628,7 +1626,7 @@ void GeomPlate_BuildPlateSurface::ComputeSurfInit()
myPlanarSurfInit = mySurfInit; myPlanarSurfInit = mySurfInit;
#if DRAW #if DRAW
if (Affich) { if (Affich) {
char* name = new char[100]; char name[256];
sprintf(name,"planinit_%d",NbPlan+1); sprintf(name,"planinit_%d",NbPlan+1);
DrawTrSurf::Set(name, mySurfInit); DrawTrSurf::Set(name, mySurfInit);
} }
@ -1715,7 +1713,7 @@ void GeomPlate_BuildPlateSurface::ComputeSurfInit()
#if DRAW #if DRAW
if (Affich) { if (Affich) {
char* name = new char[100]; char name[256];
sprintf(name,"surfinit_%d",++NbPlan); sprintf(name,"surfinit_%d",++NbPlan);
DrawTrSurf::Set(name, mySurfInit); DrawTrSurf::Set(name, mySurfInit);
} }
@ -1934,7 +1932,7 @@ Intersect(Handle(GeomPlate_HArray1OfSequenceOfReal)& PntInter,
if (Affich > 1) if (Affich > 1)
{ {
Handle(Draw_Marker3D) mark = new (Draw_Marker3D)(P1, Draw_X, Draw_vert); Handle(Draw_Marker3D) mark = new (Draw_Marker3D)(P1, Draw_X, Draw_vert);
char* name = new char[100]; char name[256];
sprintf(name,"mark_%d",++NbMark); sprintf(name,"mark_%d",++NbMark);
Draw::Set(name, mark); Draw::Set(name, mark);
} }
@ -2419,8 +2417,7 @@ VerifSurface(const Standard_Integer NbBoucle)
LinCont->D0(U,P); LinCont->D0(U,P);
Handle(Draw_Marker3D) mark = Handle(Draw_Marker3D) mark =
new (Draw_Marker3D)(P, Draw_X, Draw_orange); new (Draw_Marker3D)(P, Draw_X, Draw_orange);
char* name = new char[100]; char name[256];
sprintf(name,"mark_%d",++NbMark); sprintf(name,"mark_%d",++NbMark);
Draw::Set(name, mark); Draw::Set(name, mark);
if (!LinCont->ProjectedCurve().IsNull()) if (!LinCont->ProjectedCurve().IsNull())
@ -2451,7 +2448,7 @@ VerifSurface(const Standard_Integer NbBoucle)
LinCont->D0(U,P); LinCont->D0(U,P);
Handle(Draw_Marker3D) mark = Handle(Draw_Marker3D) mark =
new Draw_Marker3D(P, Draw_X, Draw_or); new Draw_Marker3D(P, Draw_X, Draw_or);
char* name = new char[100]; char name[256];
sprintf(name,"mark_%d",++NbMark); sprintf(name,"mark_%d",++NbMark);
Draw::Set(name, mark); Draw::Set(name, mark);
} }

6
src/GeomProjLib/GeomProjLib.cxx
View File

@ -59,8 +59,6 @@
#ifdef DRAW #ifdef DRAW
#include <DrawTrSurf.hxx> #include <DrawTrSurf.hxx>
#endif
#ifdef DEB
static Standard_Boolean Affich = Standard_False; static Standard_Boolean Affich = Standard_False;
static Standard_Integer NBPROJ = 1; static Standard_Integer NBPROJ = 1;
#endif #endif
@ -83,9 +81,7 @@ Handle(Geom2d_Curve) GeomProjLib::Curve2d(const Handle(Geom_Curve)& C,
{ {
#ifdef DRAW #ifdef DRAW
if ( Affich) { if ( Affich) {
//POP pour NT char name[256];
// char name[100];
char* name = new char[100];
Sprintf(name,"PROJCURV_%d",NBPROJ); Sprintf(name,"PROJCURV_%d",NBPROJ);
DrawTrSurf::Set(name,C); DrawTrSurf::Set(name,C);
Sprintf(name,"PROJSURF_%d",NBPROJ); Sprintf(name,"PROJSURF_%d",NBPROJ);

5
src/IntCurveSurface/IntCurveSurface_Inter.gxx
View File

@ -1610,9 +1610,8 @@ void IntCurveSurface_ComputeParamsOnQuadric(const TheSurface& surface,
ElSLib::Parameters(TheSurfaceTool::Sphere(surface),P,u,v); ElSLib::Parameters(TheSurfaceTool::Sphere(surface),P,u,v);
break; break;
} }
#ifndef DEB default:
default: break; break;
#endif
} }
} }
//======================================================================= //=======================================================================

8
src/IntPatch/IntPatch_ImpImpIntersection_0.gxx
View File

@ -73,18 +73,10 @@ static void ProcessSegments (const IntPatch_SequenceOfSegmentOfTheSOnBounds&,
const Standard_Real); const Standard_Real);
static void ProcessRLine (IntPatch_SequenceOfLine&, static void ProcessRLine (IntPatch_SequenceOfLine&,
#ifndef DEB
const IntSurf_Quadric&, const IntSurf_Quadric&,
const IntSurf_Quadric&, const IntSurf_Quadric&,
#else
const Handle(Adaptor3d_HSurface)&,
const Handle(Adaptor3d_HSurface)&,
#endif
const Standard_Real); const Standard_Real);
//-- le calcul de dist est completement faux ds la routine ci dessous a revoir (lbr le 18 nov 97) //-- le calcul de dist est completement faux ds la routine ci dessous a revoir (lbr le 18 nov 97)
Standard_Boolean IntersectionWithAnArc(gp_Pnt& PSurf, Standard_Boolean IntersectionWithAnArc(gp_Pnt& PSurf,
const Handle(IntPatch_ALine)& alin, const Handle(IntPatch_ALine)& alin,

11
src/LocOpe/LocOpe_CSIntersector.cxx
View File

@ -51,21 +51,10 @@ static Standard_Boolean LocAfter (const LocOpe_SequenceOfPntFace&,
Standard_Integer&, Standard_Integer&,
Standard_Integer&); Standard_Integer&);
#ifdef DEB
static Standard_Boolean LocBefore (const LocOpe_SequenceOfPntFace&,
const Standard_Integer,
Standard_Integer&,
Standard_Integer&);
#endif
static void AddPoints(IntCurvesFace_Intersector&, static void AddPoints(IntCurvesFace_Intersector&,
LocOpe_SequenceOfPntFace&, LocOpe_SequenceOfPntFace&,
const TopoDS_Face&); const TopoDS_Face&);
//======================================================================= //=======================================================================
//function : Init //function : Init
//purpose : //purpose :

14
src/TopOpeBRep/TopOpeBRep_Point2d.cxx
View File

@ -120,8 +120,11 @@ void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Inte
#ifdef DRAW #ifdef DRAW
cout<<FUN_tool_PRODINP()<<"P"<<Index()<<" "<<P3D.X()<<" "<<P3D.Y()<<" "<<P3D.Z()<<"; # tol = "<<tol<<endl; cout<<FUN_tool_PRODINP()<<"P"<<Index()<<" "<<P3D.X()<<" "<<P3D.Y()<<" "<<P3D.Z()<<"; # tol = "<<tol<<endl;
#endif #endif
cout<<" on (1) :"; cout<<" vertex(1) : "; cout<<(isvertex1)? 1:0; cout<<" on (1) :";
cout<<" T "<<E1index<<"(1) : "; T1.Dump(cout); cout<<" vertex(1) : ";
cout<<(isvertex1?1:0);
cout<<" T "<<E1index<<"(1) : ";
T1.Dump(cout);
cout<<" par(1) = "<<par1; cout<<" par(1) = "<<par1;
if (isvertex1) { if (isvertex1) {
P3D = BRep_Tool::Pnt(V1); P3D = BRep_Tool::Pnt(V1);
@ -129,8 +132,11 @@ void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Inte
} }
cout<<endl; cout<<endl;
cout<<" on (2) :"; cout<<" vertex(2) : "; cout<<(isvertex2)? 1:0; cout<<" on (2) :";
cout<<" T "<<E2index<<"(2) : "; T2.Dump(cout); cout<<" vertex(2) : ";
cout<<(isvertex2?1:0);
cout<<" T "<<E2index<<"(2) : ";
T2.Dump(cout);
cout<<" par(2) = "<<par2; cout<<" par(2) = "<<par2;
if (isvertex2) { if (isvertex2) {
P3D = BRep_Tool::Pnt(V2); P3D = BRep_Tool::Pnt(V2);

5
src/TopOpeBRep/TopOpeBRep_vpr.cxx
View File

@ -59,7 +59,10 @@ extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
extern Standard_Boolean TopOpeBRepDS_GettraceDSP(); extern Standard_Boolean TopOpeBRepDS_GettraceDSP();
extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i); extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i);
extern Standard_Boolean TopOpeBRep_GettraceNVP(Standard_Integer a,Standard_Integer b,Standard_Integer c,Standard_Integer d,Standard_Integer e); extern Standard_Boolean TopOpeBRep_GettraceNVP(Standard_Integer a,Standard_Integer b,Standard_Integer c,Standard_Integer d,Standard_Integer e);
extern Standard_Boolean GLOBAL_bvpr = Standard_False;void debvpr(){};
Standard_Boolean GLOBAL_bvpr = Standard_False;
void debvpr(){};
void debvprmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il,Standard_Integer vp,Standard_Integer si) void debvprmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il,Standard_Integer vp,Standard_Integer si)
{cout<<"f1,f2,il,vp,si : "<<f1<<","<<f2<<","<<il<<","<<vp<<","<<si<<endl;cout.flush();debvpr();} {cout<<"f1,f2,il,vp,si : "<<f1<<","<<f2<<","<<il<<","<<vp<<","<<si<<endl;cout.flush();debvpr();}
void debpoint(Standard_Integer i) {cout<<"+ debpoint"<<i<<endl;} void debpoint(Standard_Integer i) {cout<<"+ debpoint"<<i<<endl;}