1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

Compare commits

..

1 Commits

Author SHA1 Message Date
oan
75afece22e 0033868: Configuration - regression in wasm build
Quick fix absent definitions
2025-02-03 15:47:17 +00:00
8 changed files with 20 additions and 35 deletions

View File

@@ -38,17 +38,17 @@ If HTML documentation is not available in your package, you can:
- **Generate together with sources:** You need to have CMake and 1.8.4 (or above) installed on your system. Enable `BUILD_DOC_Overview` CMake parameter and set the path to Doxygen `3RDPARTY_DOXYGEN_EXECUTABLE`. Then build ALL or only `Overview`. - **Generate together with sources:** You need to have CMake and 1.8.4 (or above) installed on your system. Enable `BUILD_DOC_Overview` CMake parameter and set the path to Doxygen `3RDPARTY_DOXYGEN_EXECUTABLE`. Then build ALL or only `Overview`.
- **Read documentation in source plain text (Markdown) format** found in the subfolder `dox` or [GitHub Wiki](https://github.com/Open-Cascade-SAS/OCCT/wiki). - **Read documentation in source plain text (Markdown) format** found in the subfolder `dox` or [GitHub Wiki](https://github.com/Open-Cascade-SAS/OCCT/wiki).
See [dox/build/build_documentation/building_documentation.md](dox/build/build_documentation/building_documentation.md) or [Building Documentation](https://dev.opencascade.org/doc/occt-7.8.0/overview/html/build_upgrade__building_documentation.html) for details. See `dox/dev_guides/documentation/documentation.md` or [Building Documentation](https://dev.opencascade.org/doc/occt-7.8.0/overview/html/build_upgrade__building_documentation.html) for details.
## Building ## Building
In most cases, you need to rebuild OCCT on your platform (OS, compiler) before using it in your project to ensure binary compatibility. In most cases, you need to rebuild OCCT on your platform (OS, compiler) before using it in your project to ensure binary compatibility.
Consult the file [dox/build/build_occt/building_occt.md](dox/build/build_occt/building_occt.md) or [Building OCCT](https://dev.opencascade.org/doc/overview/html/build_upgrade__building_occt.html) or [Building OCCT Wiki](https://github.com/Open-Cascade-SAS/OCCT/wiki/build_upgrade) for instructions on building OCCT from sources on supported platforms. Consult the file `dox/dev_guides/building/building.md` or [Building OCCT](https://dev.opencascade.org/doc/overview/html/build_upgrade__building_occt.html) or [Building OCCT Wiki](https://github.com/Open-Cascade-SAS/OCCT/wiki/build_upgrade) for instructions on building OCCT from sources on supported platforms.
## Version ## Version
The current version of OCCT can be found in the file [`src/Standard/Standard_Version.hxx`](src/Standard/Standard_Version.hxx). The current version of OCCT can be found in the file `src/Standard/Standard_Version.hxx`.
## Development ## Development

View File

@@ -119,12 +119,6 @@ static TopoDS_Wire WireFromList(TopTools_ListOfShape& Edges)
break; break;
} }
} }
if (!itl.More())
{
Message::SendWarning() << "Warning: WireFromList: can't find the next edge. The wire is not "
"complete, some edges are lost.";
break;
}
BB.Add(aWire, anEdge); BB.Add(aWire, anEdge);
Edges.Remove(itl); Edges.Remove(itl);
} }
@@ -563,13 +557,6 @@ void BRepFill_Filling::Build()
myTolAng, myTolAng,
myTolCurv, myTolCurv,
myAnisotropie)); myAnisotropie));
if (myBoundary.IsEmpty())
{
myIsDone = Standard_False;
return;
}
TopoDS_Edge CurEdge; TopoDS_Edge CurEdge;
TopoDS_Face CurFace; TopoDS_Face CurFace;
Standard_Integer i, j; Standard_Integer i, j;

View File

@@ -773,7 +773,6 @@ void BRepLib_MakeEdge::Init(const Handle(Geom_Curve)& CC,
} }
B.Range(E, p1, p2); B.Range(E, p1, p2);
B.Degenerated(E, degenerated); B.Degenerated(E, degenerated);
E.Closed(closed);
myError = BRepLib_EdgeDone; myError = BRepLib_EdgeDone;
Done(); Done();

View File

@@ -1899,9 +1899,9 @@ Standard_Boolean BRepOffset_Tool::TryProject(const TopoDS_Face& F1,
{ {
BRepLib::BuildCurve3d(CurE, BRep_Tool::Tolerance(CurE)); BRepLib::BuildCurve3d(CurE, BRep_Tool::Tolerance(CurE));
C = BRep_Tool::Curve(CurE, L, f, l); C = BRep_Tool::Curve(CurE, L, f, l);
if (C.IsNull()) // not 3d curve, can be degenerated, need to skip if (C.IsNull())
{ {
continue; return Standard_False;
} }
} }
C = new Geom_TrimmedCurve(C, f, l); C = new Geom_TrimmedCurve(C, f, l);

View File

@@ -515,10 +515,8 @@ Standard_Boolean BRepTools_NurbsConvertModification::NewPolygon(const TopoDS_Edg
Standard_Real aFirst, aLast; Standard_Real aFirst, aLast;
Handle(Geom_Curve) aCurve = BRep_Tool::Curve(theEdge, aFirst, aLast); Handle(Geom_Curve) aCurve = BRep_Tool::Curve(theEdge, aFirst, aLast);
Handle(Geom_Curve) aNewCurve = newCurve(myMap, theEdge, aFirst, aLast); Handle(Geom_Curve) aNewCurve = newCurve(myMap, theEdge, aFirst, aLast);
if (aCurve.IsNull() || aNewCurve.IsNull()) // skip processing degenerated edges if (!aCurve.IsNull() && !aNewCurve.IsNull()) // skip processing degenerated edges
{ {
return Standard_False;
}
TColStd_Array1OfReal& aParams = thePoly->ChangeParameters(); TColStd_Array1OfReal& aParams = thePoly->ChangeParameters();
for (Standard_Integer anInd = aParams.Lower(); anInd <= aParams.Upper(); ++anInd) for (Standard_Integer anInd = aParams.Lower(); anInd <= aParams.Upper(); ++anInd)
{ {
@@ -527,6 +525,7 @@ Standard_Boolean BRepTools_NurbsConvertModification::NewPolygon(const TopoDS_Edg
newParameter(aPoint, aNewCurve, aFirst, aLast, aTol, aParam); newParameter(aPoint, aNewCurve, aFirst, aLast, aTol, aParam);
} }
} }
}
return Standard_True; return Standard_True;
} }

View File

@@ -439,7 +439,7 @@ void GeomPlate_BuildAveragePlane::BasePlan(const gp_Vec& OZ)
|| ((Abs(n1) <= myTol) && (Abs(n3) <= myTol))) || ((Abs(n1) <= myTol) && (Abs(n3) <= myTol)))
{ {
myOX.SetCoord(V3(1), V3(2), V3(3)); myOX.SetCoord(V3(1), V3(2), V3(3));
myOY = OZ ^ myOX; myOY.SetCoord(0, 0, 0);
} }
else else
{ {

View File

@@ -195,12 +195,9 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_Surface)& S1,
aProjectedCurve.FirstParameter(), aProjectedCurve.FirstParameter(),
aProjectedCurve.LastParameter()); aProjectedCurve.LastParameter());
Geom2dInt_GInter Intersector(AC, Precision::Confusion(), Precision::Confusion()); Geom2dInt_GInter Intersector(AC, Precision::Confusion(), Precision::Confusion());
if (Intersector.IsDone() if (Intersector.IsDone() && Intersector.IsEmpty())
&& (Intersector.IsEmpty() || (AC.IsClosed() && Intersector.NbPoints() == 1)))
{
break; break;
} }
}
Standard_FALLTHROUGH Standard_FALLTHROUGH
default: { default: {
IntPatch_PrmPrmIntersection interpp; IntPatch_PrmPrmIntersection interpp;

View File

@@ -40,10 +40,13 @@ IMPLEMENT_STANDARD_RTTIEXT(OpenGl_GraphicDriver, Graphic3d_GraphicDriver)
#include <Aspect_NeutralWindow.hxx> #include <Aspect_NeutralWindow.hxx>
#endif #endif
#if !defined(_WIN32) && !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) \ #if !defined(_WIN32) && !defined(__ANDROID__) && !defined(__QNX__) \
&& (!defined(__APPLE__) || defined(HAVE_XLIB)) && (!defined(__APPLE__) || defined(HAVE_XLIB))
#include <X11/Xlib.h> // XOpenDisplay() #include <X11/Xlib.h> // XOpenDisplay()
#include <X11/Xutil.h>
#if !defined(__EMSCRIPTEN__)
#include <GL/glx.h> #include <GL/glx.h>
#endif
#endif #endif
#if !defined(HAVE_EGL) #if !defined(HAVE_EGL)