0033868: Configuration - regression in wasm build

Quick fix absent definitions

README.md

@@ -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`.
 - **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
 
 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
 
-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
 

src/BRepFill/BRepFill_Filling.cxx

@@ -119,12 +119,6 @@ static TopoDS_Wire WireFromList(TopTools_ListOfShape& Edges)
         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);
     Edges.Remove(itl);
   }
@@ -563,13 +557,6 @@ void BRepFill_Filling::Build()
                                                   myTolAng,
                                                   myTolCurv,
                                                   myAnisotropie));
-
-  if (myBoundary.IsEmpty())
-  {
-    myIsDone = Standard_False;
-    return;
-  }
-
   TopoDS_Edge      CurEdge;
   TopoDS_Face      CurFace;
   Standard_Integer i, j;

src/BRepLib/BRepLib_MakeEdge.cxx

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

src/BRepOffset/BRepOffset_Tool.cxx

@@ -1899,9 +1899,9 @@ Standard_Boolean BRepOffset_Tool::TryProject(const TopoDS_Face&          F1,
     {
       BRepLib::BuildCurve3d(CurE, BRep_Tool::Tolerance(CurE));
       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);

src/BRepTools/BRepTools_NurbsConvertModification.cxx

@@ -515,16 +515,15 @@ Standard_Boolean BRepTools_NurbsConvertModification::NewPolygon(const TopoDS_Edg
     Standard_Real      aFirst, aLast;
     Handle(Geom_Curve) aCurve    = BRep_Tool::Curve(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();
-    for (Standard_Integer anInd = aParams.Lower(); anInd <= aParams.Upper(); ++anInd)
-    {
-      Standard_Real& aParam = aParams(anInd);
-      gp_Pnt         aPoint = aCurve->Value(aParam);
-      newParameter(aPoint, aNewCurve, aFirst, aLast, aTol, aParam);
+      TColStd_Array1OfReal& aParams = thePoly->ChangeParameters();
+      for (Standard_Integer anInd = aParams.Lower(); anInd <= aParams.Upper(); ++anInd)
+      {
+        Standard_Real& aParam = aParams(anInd);
+        gp_Pnt         aPoint = aCurve->Value(aParam);
+        newParameter(aPoint, aNewCurve, aFirst, aLast, aTol, aParam);
+      }
     }
   }
   return Standard_True;

src/GeomPlate/GeomPlate_BuildAveragePlane.cxx

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

src/Graphic3d/Graphic3d_CView.hxx

@@ -89,12 +89,6 @@ public:
   //! Sets camera used by the view.
   virtual void SetCamera(const Handle(Graphic3d_Camera)& theCamera) { myCamera = theCamera; }
 
-  //! Returns necessity to flip OY in projection matrix
-  virtual Standard_Boolean ToFlipOutput() const { return Standard_False; }
-
-  //! Sets state of flip OY necessity in projection matrix
-  virtual void SetToFlipOutput(const Standard_Boolean) {}
-
 public:
   //! Returns default Shading Model of the view; Graphic3d_TypeOfShadingModel_Phong by default.
   Graphic3d_TypeOfShadingModel ShadingModel() const { return myRenderParams.ShadingModel; }

src/IntPatch/IntPatch_Intersection.cxx

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

src/OpenGl/OpenGl_GraphicDriver.cxx

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

src/OpenGl/OpenGl_View.hxx

@@ -340,15 +340,6 @@ public: //! @name obsolete Graduated Trihedron functionality
                                                               const Graphic3d_Vec3 theMax)
     Standard_OVERRIDE;
 
-  //! Returns necessity to flip OY in projection matrix
-  virtual Standard_Boolean ToFlipOutput() const Standard_OVERRIDE { return myToFlipOutput; }
-
-  //! Sets state of flip OY necessity in projection matrix
-  virtual void SetToFlipOutput(const Standard_Boolean theFlip) Standard_OVERRIDE
-  {
-    myToFlipOutput = theFlip;
-  }
-
 protected: //! @name Internal methods for managing GL resources
   //! Initializes OpenGl resource for environment texture.
   void initTextureEnv(const Handle(OpenGl_Context)& theContext);

src/ViewerTest/ViewerTest_ViewerCommands.cxx

@@ -11027,20 +11027,6 @@ static Standard_Integer VRenderParams(Draw_Interpretor& theDI,
         ++anArgIter;
       }
     }
-    else if (aFlag == "-flip")
-    {
-      if (toPrint)
-      {
-        theDI << (aView->View()->ToFlipOutput() ? "on " : "off ");
-        continue;
-      }
-      Standard_Boolean isToFlipOutput = Standard_False;
-      if (anArgIter + 1 < theArgNb && Draw::ParseOnOff(theArgVec[anArgIter + 1], isToFlipOutput))
-      {
-        aView->View()->SetToFlipOutput(isToFlipOutput);
-        ++anArgIter;
-      }
-    }
     else if (aFlag == "-rendscale" || aFlag == "-renderscale" || aFlag == "-renderresolutionscale")
     {
       if (toPrint)
@@ -14396,7 +14382,7 @@ vrenderparams [-raster] [-shadingModel {unlit|facet|gouraud|phong|pbr|pbr_facet}
               [-shadows {on|off}=on] [-shadowMapResolution value=1024] [-shadowMapBias value=0.005]
               [-depthPrePass {on|off}=off] [-alphaToCoverage {on|off}=on]
               [-frustumCulling {on|off|noupdate}=on] [-lineFeather width=1.0]
-              [-sync {default|views}] [-reset] [-flip {on|off}=off]
+              [-sync {default|views}] [-reset]
  -raster          Disables GPU ray-tracing.
  -shadingModel    Controls shading model.
  -msaa            Specifies number of samples for MSAA.
@@ -14418,7 +14404,6 @@ vrenderparams [-raster] [-shadingModel {unlit|facet|gouraud|phong|pbr|pbr_facet}
                    sets state to check structures culled previously.
   -sync            Sets active View parameters as Viewer defaults / to other Views.
   -reset           Resets active View parameters to Viewer defaults.
-  -flip            Flips View Vertically.
 
 Diagnostic output (on-screen overlay):
 vrenderparams [-perfCounters none|fps|cpu|layers|structures|groups|arrays|triangles|points