0032839: BRepMesh_IncrementalMesh - The ability to pass progress indication to one of the constructors was not added

Added progress indication to the constructor of the BRepMesh_IncrementalMesh

CMakeLists.txt

@@ -56,20 +56,6 @@ set_property (GLOBAL PROPERTY OCC_VERSION_MAJOR ${OCC_VERSION_MAJOR})
 set_property (GLOBAL PROPERTY OCC_VERSION_MINOR ${OCC_VERSION_MINOR})
 set_property (GLOBAL PROPERTY OCC_VERSION_MAINTENANCE ${OCC_VERSION_MAINTENANCE})
 
-# set soversion variable determining compatibility version on platforms with symlinks
-# 0 - for empty, 1 - for major, 2 - for major.minor, 3 - for major.minor.maintenance
-if (NOT BUILD_SOVERSION_NUMBERS)
-  set (BUILD_SOVERSION_NUMBERS "0" CACHE STRING "${BUILD_SOVERSION_NUMBERS_DESCR}" FORCE)
-  SET_PROPERTY(CACHE BUILD_SOVERSION_NUMBERS PROPERTY STRINGS 0 1 2 3)
-
-  # update default state of soversion on different platforms
-  if (WIN32 OR ANDROID OR EMSCRIPTEN)
-    set (BUILD_SOVERSION_NUMBERS 0)
-  else()
-    set (BUILD_SOVERSION_NUMBERS 2)
-  endif()
-endif()
-
 set (INSTALL_TEST_CASES OFF CACHE BOOL "${INSTALL_TEST_CASES_DESCR}")
 
 # Regeneration of OCCT resource files
@@ -1239,7 +1225,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
 endforeach()
 # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
 install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
-install (CODE "file(INSTALL FILES \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" DESTINATION \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/\" TYPE FILE)")
+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
 
 foreach (OCCT_MODULE ${OCCT_MODULES})
   if (BUILD_MODULE_${OCCT_MODULE})

adm/cmake/occt_toolkit.cmake

@@ -280,17 +280,14 @@ get_property (OCC_VERSION_MAJOR GLOBAL PROPERTY OCC_VERSION_MAJOR)
 get_property (OCC_VERSION_MINOR GLOBAL PROPERTY OCC_VERSION_MINOR)
 get_property (OCC_VERSION_MAINTENANCE GLOBAL PROPERTY OCC_VERSION_MAINTENANCE)
 
-set (OCC_SOVERSION "")
+if (ANDROID)
-if (BUILD_SOVERSION_NUMBERS GREATER 2)
+  # do not append version to the filename
-  set (OCC_SOVERSION "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
+  set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
-elseif (BUILD_SOVERSION_NUMBERS GREATER 1)
+else()
-  set (OCC_SOVERSION "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}")
+  set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}"
-elseif (BUILD_SOVERSION_NUMBERS GREATER 0)
+                                                    SOVERSION     "${OCC_VERSION_MAJOR}"
-  set (OCC_SOVERSION "${OCC_VERSION_MAJOR}")
+                                                    VERSION       "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
 endif()
-set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}"
-                                                  SOVERSION     "${OCC_SOVERSION}"
-                                                  VERSION       "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
 
 set (USED_TOOLKITS_BY_CURRENT_PROJECT)
 set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)

adm/cmake/vardescr.cmake

@@ -28,9 +28,6 @@ Applies only for Debug configuration.")
 set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
 "Append the postfix to names of output libraries")
 
-set (BUILD_SOVERSION_NUMBERS_DESCR
-"Version numbers to put into SONAME: 0 - for empty, 1 - for major, 2 - for major.minor, 3 - for major.minor.maintenance")
-
 set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
 "Disables exceptions like Standard_OutOfRange in Release builds.
 Defines No_Exception macros for Release builds when enabled (default).

adm/qmake/OccToolkit.pri

@@ -132,31 +132,21 @@ for (aPackage, aPackages) {
   }
 }
 
+# extend clean with versioned .so files
 !win32 {
   aVerList = $$split(VERSION, ".")
   aVerMaj = $$member(aVerList, 0)
   aVerMin = $$member(aVerList, 1)
   aVerMic = $$member(aVerList, 2)
-
   equals(TEMPLATE, app) {
     QMAKE_CLEAN += $$DESTDIR/$${TARGET}
   } else {
     mac {
-      # override qmake soname versionong logic
-      QMAKE_LFLAGS_SONAME =
-      QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.dylib.$${aVerMaj}.$${aVerMin}
-
-      # extend clean with versioned .dylib files
       QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.dylib
       QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.dylib
       QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.dylib
       QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.$${aVerMic}.dylib
     } else {
-      # override qmake soname versionong logic
-      QMAKE_LFLAGS_SONAME =
-      QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
-
-      # extend clean with versioned .so files
       QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so
       QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}
       QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}

dox/build/build_3rdparty/building_3rdparty.md

@@ -2,18 +2,30 @@
 ==============================================
 @tableofcontents
 
-On Windows, the easiest way to install third-party libraries is to download archive with pre-built binaries from https://dev.opencascade.org/resources/download/3rd-party-components.
+On Windows, the easiest way to install third-party libraries is to download archive with pre-built binaries from https://opencascade.com/content/3rd-party-components.
-On Linux and macOS, it is recommended to use the version installed in the system natively.
+On Linux and OS X, it is recommended to use the version installed in the system natively.
 
 @section dev_guides__building_3rdparty_win_1 Windows
 
-This section presents guidelines for building third-party products used by Open CASCADE Technology (OCCT) and samples on Windows platform.
+This document presents guidelines for building third-party products used by Open CASCADE Technology (OCCT) and samples on Windows platform. It is assumed that you are already familiar with MS Visual Studio / Visual C++. 
-It is assumed that you are already familiar with MS Visual Studio / Visual C++.
 
-You need to use the same version of MS Visual Studio for building all third-party products and OCCT itself, in order to receive a consistent set of runtime binaries.
+You need to use the same version of MS Visual Studio for building all third-party products and OCCT itself, in order to receive a consistent set of run-time binaries. 
 
-It is recommended to create a separate new folder on your workstation, where you will unpack the downloaded archives of the third-party products, and where you will build these products (for example, `c:/occ3rdparty`).
+The links for downloading the third-party products are available at https://opencascade.com/content/3rd-party-components.
-Further in this document, this folder is referred to as `3rdparty`.
+
+There are two types of third-party products used  by OCCT: 
+
+* Mandatory  products: 
+	* Tcl/Tk 8.5 -- 8.6;
+	* FreeType 2.4.10 -- 2.5.3.
+* Optional  products:
+	* TBB 3.x -- 4.x;
+	* FreeImage 3.14.1 -- 3.16.0;
+	* VTK 6.1.0.
+
+It is recommended to create a separate new folder on your workstation, where you will unpack the downloaded archives of the third-party  products, and where you will build these products (for example, *c:\\occ3rdparty*). 
+
+Further in this document, this folder is referred to as *3rdparty*. 
 
 @subsection dev_guides__building_3rdparty_win_2 Tcl/Tk
 
@@ -23,9 +35,9 @@ Tcl/Tk is required for DRAW test harness.
   
 Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
   
-1. In the `win` sub-directory, edit file `buildall.vc.bat`:
+1. In the *win* sub-directory, edit file *buildall.vc.bat*:
 
-   * Edit the line `"call ... vcvars32.bat"` to have correct path to the version of Visual Studio to be used for building, for instance:
+   * Edit the line "call ... vcvars32.bat" to have correct path to the version of Visual Studio to be used for building, for instance:
 
          call "%VS80COMNTOOLS%\vsvars32.bat"
 
@@ -33,17 +45,17 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h
 
          call "%VS80COMNTOOLS%\..\..\VC\vcvarsall.bat" amd64
      
-   * Define variable `INSTALLDIR` pointing to directory where Tcl/Tk will be installed, e.g.:
+   * Define variable *INSTALLDIR* pointing to directory where Tcl/Tk will be installed, e.g.:
 
          set INSTALLDIR=D:\OCCT\3rdparty\tcltk-86-32
 
-   * Add option `install` to the first command line calling `nmake`:
+   * Add option *install* to the first command line calling *nmake*:
 
          nmake -nologo -f makefile.vc release htmlhelp install %1
 
-   * Remove second call to `nmake` (building statically linked executable)
+   * Remove second call to *nmake* (building statically linked executable)
 
-2. Edit file `rules.vc` replacing line
+2. Edit file *rules.vc* replacing line 
 
        SUFX	    = tsgx
 
@@ -53,18 +65,21 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h
 
    This is to avoid extra prefix 't' in the library name, which is not recognized by default by OCCT build tools.
 
+
 3. By default, Tcl uses dynamic version of run-time library (MSVCRT), which must be installed on the system where Tcl will be used.
    You may wish to link Tcl library with static version of run-time to avoid this dependency.
    For that:
 
-   * Edit file `makefile.vc` replacing strings `"crt = -MD"` by `"crt = -MT"`
+   * Edit file *makefile.vc* replacing strings "crt = -MD" by "crt = -MT"
 
-   * Edit source file `tclMain.c` (located in folder `generic`) commenting out forward declaration of function `isatty()`.
+   * Edit source file *tclMain.c* (located in folder *generic*) commenting out forward declaration of function *isatty()*.
 
-4. In the command prompt, run `buildall.vc.bat`<br>
-   You might need to run this script twice to have `tclsh` executable installed; check subfolder `bin` of specified installation path to verify this.
 
-5. For convenience of use, we recommend making a copy of `tclsh` executable created in subfolder `bin` of `INSTALLDIR` and named with Tcl version number suffix, as `tclsh.exe` (with no suffix)
+4. In the command prompt, run *buildall.vc.bat*
+
+   You might need to run this script twice to have *tclsh* executable installed; check subfolder *bin* of specified installation path to verify this.
+
+5. For convenience of use, we recommend making a copy of *tclsh* executable created in subfolder *bin* of *INSTALLDIR* and named with Tcl version number suffix, as *tclsh.exe* (with no suffix)
 
        > cd D:\OCCT\3rdparty\tcltk-86-32\bin
        > cp tclsh86.exe tclsh.exe
@@ -72,113 +87,129 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h
 **Installation from sources: Tk**
   
 Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
-Apply the same steps as described for building Tcl above, with the same `INSTALLDIR`.
-Note that Tk produces its own executable, called `wish`.
 
-You might need to edit default value of `TCLDIR` variable defined in `buildall.vc.bat` (should be not necessary if you unpack both Tcl and Tk sources in the same folder).
+Apply the same steps as described for building Tcl above, with the same INSTALLDIR.
+Note that Tk produces its own executable, called *wish*. 
+
+You might need to edit default value of *TCLDIR* variable defined in *buildall.vc.bat* (should be not necessary if you unpack both Tcl and Tk sources in the same folder).
 
 @subsection dev_guides__building_3rdparty_win_2_2 FreeType
 
-FreeType is required for text display in a 3D viewer.
+FreeType is required for text display in a 3D viewer. You can download its sources from https://sourceforge.net/projects/freetype/files/
-You can download its sources from https://freetype.org/
 
-1. Unpack the downloaded archive of FreeType product into the `3rdparty` folder.
+### The building procedure
-   As a result, you will get a folder named, for example, `3rdparty/freetype-2.4.10`.
-   Further in this document, this folder is referred to as `freetype`.
 
-2. Open the solution file `freetype/builds/win32/vc20xx/freetype.sln` in Visual Studio.
+1. Unpack the downloaded archive of FreeType product into the *3rdparty*  folder. As a result, you will get a folder named, for example, *3rdparty\\freetype-2.4.10*.  Further in this document, this folder is referred to as *freetype*. 
-   Here `vc20xx` stands for your version of Visual Studio.
    
-3. Select the configuration to build: either `Debug` or `Release`.
+2. Open the solution file *freetype\\builds\\win32\\vc20xx\\freetype.sln*  in Visual Studio. Here *vc20xx* stands for your version of Visual Studio. 
 
-4. Build the `freetype` project.<br>
+3. Select the configuration to build: either Debug or Release. 
-   As a result, you will get a `freetype` import library (`.lib`) in the `freetype/obj/win32/vc20xx` folder.
 
-5. If you build FreeType for a 64 bit platform, select in the main menu `Build - Configuration Manager`
+4. Build  the *freetype* project. 
-   and add `x64` platform to the solution configuration by copying the settings from `Win32` platform:
+
+   As a result, you will get a  freetype import library (.lib) in the *freetype\\obj\\win32\\vc20xx*  folder.  
+
+
+5. If you build FreeType for a 64 bit platform, select in the main menu **Build - Configuration Manager**  and add *x64* platform to the solution configuration by copying the settings from Win32 platform: 
 
    @figure{/build/build_3rdparty/images/3rdparty_image001.png}
 
-   Update the value of the Output File for `x64` configuration:
+   Update the value of the Output File for  x64 configuration: 
 
    @figure{/build/build_3rdparty/images/3rdparty_image003.png}
 
-   Build the `freetype` project.<br>
+   Build the *freetype* project. 
-   As a result, you will obtain a 64 bit import library (`.lib`) file in the `freetype/x64/vc20xx` folder.
-   To build FreeType as a dynamic library (`.dll`) follow steps 6, 7 and 8 of this procedure.
 
-6. Open menu Project-> Properties-> Configuration  Properties-> General and change option `Configuration Type` to `Dynamic Library (.dll)`.
+   As a result, you will obtain a 64 bit import library (.lib) file in the *freetype\\x64\\vc20xx*  folder. 
-7. Edit file `freetype/include/freetype/config/ftoption.h`:<br>
+
-   in line 255, uncomment the definition of macro `FT_EXPORT` and change it as follows:
+   To build FreeType as a dynamic library (.dll) follow steps 6, 7 and 8 of this procedure. 
+
+6. Open menu Project-> Properties-> Configuration  Properties-> General and change option **Configuration Type** to *Dynamic  Library (.dll)*. 
+7. Edit file *freetype\\include\\freetype\\config\\ftoption.h*:  
+  
+   in line 255, uncomment the definition of macro *FT_EXPORT* and change it as follows: 
 
        #define FT_EXPORT(x)   __declspec(dllexport) x 
 
-8. Build the `freetype` project.<br>
+8. Build  the *freetype* project. 
-   As a result, you will obtain the files of the import library (`.lib`) and the dynamic library (`.dll`) in folders `freetype/objs/release` or `freetype/objs/debug`.
+
+   As a result, you will obtain the files of the import  library (.lib) and the dynamic library (.dll)   in folders <i>freetype  \\objs\\release</i> or <i>\\objs\\debug </i>. 
+   
    If you build for a 64 bit platform, follow step 5 of the procedure. 
 
-   To facilitate the use of FreeType libraries in OCCT with minimal adjustment of build procedures,
+   To facilitate the use of FreeType libraries in OCCT with minimal adjustment of build procedures, it is recommended to copy the include files and libraries of FreeType into a separate folder, named according to the pattern: *freetype-compiler-bitness-building mode*, where: 
-   it is recommended to copy the include files and libraries of FreeType into a separate folder, named according to the pattern `freetype-compiler-bitness-building mode`, where:
+   * **compiler** is *vc8* or *vc9* or *vc10* or *vc11*; 
-   * `compiler` is `vc8` or `vc9` or `vc10` or `vc11`;
+   * **bitness**  is *32* or *64*;
-   * `bitness`  is `32` or `64`;
+   * **building mode** is *opt* (for Release) or *deb* (for Debug). 
-   * `building mode` is `opt` (for `Release`) or `deb` (for `Debug`).
+    
+   The *include* subfolder should be copied as is, while libraries should be renamed to *freetype.lib* and *freetype.dll* (suffixes removed) and placed to subdirectories *lib *and  *bin*, respectively. If the Debug configuration is built, the Debug libraries should be put into subdirectories *libd* and *bind*. 
 
-   The `include` subfolder should be copied as is, while libraries should be renamed to `freetype.lib` and `freetype.dll` (suffixes removed) and placed to subdirectories `lib` and `bin`, respectively.
-   If the `Debug` configuration is built, the Debug libraries should be put into subdirectories `libd` and `bind`.
 
 @subsection dev_guides__building_3rdparty_win_3_1 TBB
 
-This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
+This third-party product is installed with binaries 
-Go to the **Download** page, find the release version you need (e.g. `tbb30_018oss`) and pick the archive for Windows platform.
+from the archive that can be downloaded from https://github.com/intel/tbb.
+Go to the **Download** page, find the  release version you need  (e.g. *tbb30_018oss*) and pick the archive for Windows  platform. 
 
-Unpack the downloaded archive of TBB product into the `3rdparty` folder.
+Unpack the downloaded  archive of TBB product into the *3rdparty* folder. 
 
-Further in this document, this folder is referred to as `tbb`.
+Further in this document,  this folder is referred to as *tbb*. 
 
 @subsection dev_guides__building_3rdparty_win_3_3 FreeImage
 
-This third-party product should be built as a dynamically loadable library (`.dll` file).
+This third-party product should be built as a dynamically loadable library (.dll file). 
 You can download its sources from 
 https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
 
-1. Unpack the downloaded archive of FreeImage product into `3rdparty` folder.<br>
+### The building procedure: 
-   As a result, you should have a folder named `3rdparty/FreeImage`.
-   Rename it according to the rule: `freeimage-platform-compiler-building mode`, where
 
-   * `platform`  is `win32` or `win64`;
+1. Unpack the  downloaded archive of FreeImage product into *3rdparty* folder. 
-   * `compiler`  is `vc8` or `vc9` or `vc10` or `vc11`;
-   * `building mode` is *opt* (for release) or `deb` (for debug)
   
-   Further in this document, this folder is referred to as `freeimage`.
+   As a result, you should have a folder named *3rdparty\\FreeImage*. 
+  
+   Rename it according to the rule: *freeimage-platform-compiler-building  mode*, where 
+   
+   * **platform**  is *win32* or *win64*; 
+   * **compiler**  is *vc8* or *vc9* or *vc10* or *vc11*; 
+   * **building  mode** is *opt* (for release) or *deb* (for debug) 
+
+   Further in this  document, this folder is referred to as *freeimage*. 
+
+2. Open the solution file *freeimage\\FreeImage.*.sln* in your Visual Studio. 
   
-2. Open the solution file `freeimage/FreeImage.*.sln` in your Visual Studio.<br>
    If you use a Visual Studio version higher than VC++ 2008, apply conversion of the workspace. 
-   Such conversion should be suggested automatically by Visual Studio.
+   Such conversion should be suggested automatically by Visual  Studio. 
     
-3. Select a configuration to build.
+3. Select a  configuration to build. 
-   - Choose `Release` if you are building Release binaries.
+
-   - Choose `Debug` if you are building Debug binaries.
+   - Choose **Release**  if you are building Release binaries. 
+   - Choose **Debug** if you are building  Debug binaries. 
 
    *Note:* 
 
-   If you want to build a debug version of FreeImage binaries then you need to rename the following files in FreeImage projects:
+   If you want to  build a debug version of FreeImage binaries then you need to rename the following files in FreeImage and FreeimagePlus projects:
    
    Project -> Properties -> Configuration Properties -> Linker -> General -> Output File
 
        FreeImage*d*.dll  to FreeImage.dll 
+       FreeImagePlus*d*.dll to FreeImagePlus.dll 
 
    Project -> Properties -> Configuration Properties -> Linker -> Debugging-> Generate Program Database File
 
        FreeImage*d*.pdb  to FreeImage.pdb 
+       FreeImagePlus*d*.pdb to FreeImagePlus.pdb 
 
    Project -> Properties -> Configuration Properties -> Linker -> Advanced-Import Library
 
        FreeImage*d*.lib  to FreeImage.lib 
+       FreeImagePlus*d*.lib  to FreeImagePlus.lib 
 
    Project -> Properties -> Configuration Properties -> Build Events -> Post -> Build Event -> Command Line 
 
        FreeImage*d*.dll     to FreeImage.dll 
        FreeImage*d*.lib     to FreeImage.lib 
+       FreeImagePlus*d*.dll to FreeImagePlus.dll 
+       FreeImagePlus*d*.lib to FreeImagePlus.lib 
 
    Additionally, rename in project FreeImagePlus 
    
@@ -187,38 +218,59 @@ https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
        from FreeImage*d*.lib to FreeImage.lib 
 
 4. Select a platform to build. 
-   - Choose `Win32` if you are building for a 32 bit platform.
-   - Choose `x64` if you are building for a 64 bit platform.
 
-5. Start the building process.<br>
+   - Choose *Win32* if you are building for a 32 bit platform. 
-   As a result, you should have the library files of FreeImage product in `freeimage/Dist` folder (`FreeImage.dll` and `FreeImage.lib`).
+   - Choose *x64* if you are building for a 64 bit platform. 
+
+5. Start the building process. 
+
+   As a result, you should have the  library files of FreeImage product  in *freeimage\\Dist* folder (*FreeImage.dll* and *FreeImage.lib*) and in *freeimage\\Wrapper\\FreeImagePlus\\dist* folder (*FreeImagePlus.dll* and *FreeImagePlus.lib*).
 
 @subsection dev_guides__building_3rdparty_win_3_4 VTK
 
-VTK Integration Services component provides adaptation functionality for visualization of OCCT topological shapes by means of VTK library.
+VTK is an open-source, freely available software system for 3D computer graphics, image processing and visualization. VTK Integration Services component provides adaptation functionality for visualization of OCCT topological shapes by means of VTK library.
 
-1. Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it into `3rdparty` folder.<br>
+### The building procedure:
-   As a result, you will get a folder named, for example, `3rdparty/VTK-6.1.0`.
+
-   Further in this document, this folder is referred to as `VTK`.
+1. Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it into *3rdparty* folder.
+
+   As a result, you will get a folder named, for example, <i>3rdparty\VTK-6.1.0.</i>
+
+   Further in this document, this folder is referred to as *VTK*.
 
 2. Use CMake to generate VS projects for building the library:
-   - Start CMake-GUI and select `VTK` folder as source path, and the folder of your choice for VS project and intermediate build data.
+   - Start CMake-GUI and select VTK folder as source path, and the folder of your choice for VS project and intermediate build data.
    - Click **Configure**.
    - Select the VS version to be used from the ones you have installed (we recommend using VS 2015) and the architecture (32 or 64-bit).
-   - Generate VS projects with default CMake options. The open solution `VTK.sln` will be generated in the build folder.
+   - Generate VS projects with default CMake options. The open solution *VTK.sln* will be generated in the build folder.
 
 3. Build project VTK in Release mode.
 
+
 @section build_3rdparty_linux Linux
 
-This section presents additional guidelines for building third-party products used by Open CASCADE Technology and samples on Linux platform.
+This document presents additional guidelines for building third-party 
+products used by Open CASCADE Technology and samples on Linux platform. 
+
+The links for downloading the third-party products are available on the web site at 
+https://opencascade.com/content/3rd-party-components.
+
+There are two types of third-party products, which are  necessary to build OCCT: 
+  
+* Mandatory  products: 
+	* Tcl/Tk 8.5 - 8.6;  
+	* FreeType 2.4.10 - 2.5.3;
+* Optional  products: 
+	* TBB 3.x - 4.x;
+	* FreeImage 3.14.1 - 3.16.0;
+	* VTK 6.1.0.
 
 @subsection dev_guides__building_3rdparty_linux_4 Installation From Official Repositories
 
 **Debian-based distributives**
 
-All 3rd-party products required for building of OCCT could be installed from official repositories.
+All 3rd-party products required for building of OCCT could be installed
-You may install them from console using apt-get utility:
+from official repositories. You may install them from console using apt-get utility:
 
     sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libx11-dev libgl1-mesa-dev libfreeimage-dev
     sudo apt-get install rapidjson-dev libdraco-dev
@@ -235,22 +287,22 @@ Tcl/Tk is required for DRAW test harness.
   
 Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
   
-1. Enter the `unix` sub-directory of the directory where the Tcl source files are located (`TCL_SRC_DIR`).
+1. Enter the unix sub-directory of the directory where the Tcl source  files are located <i>(TCL_SRC_DIR)</i>. 
 
        cd TCL_SRC_DIR/unix   
 
-2. Run the `configure` command:
+2. Run the *configure* command:
 
        configure --enable-gcc  --enable-shared --enable-threads --prefix=TCL_INSTALL_DIR   
 
-   For a 64 bit platform also add `--enable-64bit` option to the command line.
+   For a 64 bit platform also add <i>--enable-64bit</i> option to the command line. 
   
-3. If the configure command has finished successfully, start the building process:
+3. If the configure command has finished successfully, start  the building process:
   
        make   
 
 4. If building is finished successfully, start the installation of Tcl. 
-   All binary and service files of the product will be copied to the directory defined by `TCL_INSTALL_DIR`
+   All binary and service files of the product will be copied to the directory defined by *TCL_INSTALL_DIR* 
 
        make install   
 
@@ -258,15 +310,15 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h
   
 Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
   
-1. Enter the `unix` sub-directory of the directory where the Tk source files are located (`TK_SRC_DIR`)
+1. Enter the unix sub-directory of the directory where the Tk source files are located <i>(TK_SRC_DIR)</i> 
 
        cd TK_SRC_DIR/unix   
 
-2. Run the `configure` command, where `TCL_LIB_DIR` is `TCL_INSTALL_DIR/lib`.
+2. Run the configure command, where <i>TCL_LIB_DIR</i> is *TCL_INSTALL_DIR/lib*.
 
        configure --enable-gcc  --enable-shared --enable-threads --with-tcl=TCL_LIB_DIR  --prefix=TK_INSTALL_DIR   
 
-   For a 64 bit platform also add `--enable-64bit` option to the command line.
+   For a 64 bit platform also add <i>--enable-64bit</i> option to the  command line. 
 
 3. If the configure command has finished successfully, start the building process: 
 
@@ -274,51 +326,52 @@ Download the necessary archive from https://www.tcl.tk/software/tcltk/download.h
 
 4. If the building has finished successfully, start the installation of Tk. 
    All binary and service files of the product will be copied 
-   to the directory defined by `TK_INSTALL_DIR` (usually it is `TCL_INSTALL_DIR`)
+   to the directory defined by *TK_INSTALL_DIR* (usually it is *TCL_INSTALL_DIR*) 
 
        make install   
 
 @subsection dev_guides__building_3rdparty_linux_2_2 FreeType
 
 FreeType is required for text display in the 3D viewer. 
-Download the necessary archive from https://freetype.org/ and unpack it.
+Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
   
-1. Enter the directory where the source files of FreeType are located (`FREETYPE_SRC_DIR`).
+1. Enter the directory where the source files of FreeType  are located <i>(FREETYPE_SRC_DIR)</i>. 
 
        cd FREETYPE_SRC_DIR   
 
-2. Run the `configure` command:
+2. Run the *configure* command: 
   
        configure  --prefix=FREETYPE_INSTALL_DIR   
 
-   For a 64 bit platform also add `CFLAGS='-m64 -fPIC'  CPPFLAGS='-m64 -fPIC'` option to the command line.
+   For a 64 bit platform also add <i>CFLAGS='-m64 -fPIC'  CPPFLAGS='-m64 -fPIC'</i> option to the command line. 
     
-3. If the `configure` command has finished successfully, start the building process:
+3. If the *configure* command has finished successfully, start  the building process: 
 
        make   
 
 4. If the building has finished successfully, start the installation of FreeType. 
-   All binary and service files of the product will be copied to the directory defined by `FREETYPE_INSTALL_DIR`
+   All binary and service files of the product will be copied to the directory defined by *FREETYPE_INSTALL_DIR* 
     
        make install   
 
+    
 @subsection dev_guides__building_3rdparty_linux_3_1 TBB
 
-This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
+This third-party product is  installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
-Go to the **Download** page, find the release version you need and pick the archive for Linux platform.
+Go to the **Download** page, find the  release version you need and pick the archive for Linux platform.
 To install, unpack the downloaded archive of TBB product.
 
 @subsection dev_guides__building_3rdparty_linux_3_3 FreeImage
 
-Download the necessary archive from https://sourceforge.net/projects/freeimage/files/Source%20Distribution/ and unpack it.
+Download the necessary archive from https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
-The directory with unpacked sources is  further referred to as `FREEIMAGE_SRC_DIR`.
+and unpack it. The directory with unpacked sources is  further referred to as *FREEIMAGE_SRC_DIR*. 
   
-1. Modify `FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h`:<br>
+1. Modify *FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h*: 
    In line 60 insert the following: 
 
        #include string.h   
 
-2. Enter the directory where the source files of FreeImage are located (`FREEIMAGE_SRC_DIR`).
+2. Enter the directory where the source files of FreeImage are located <i>(FREEIMAGE_SRC_DIR)</i>. 
   
        cd FREEIMAGE_SRC_DIR   
 
@@ -328,11 +381,10 @@ The directory with unpacked sources is  further referred to as `FREEIMAGE_SRC_DI
 
 4. Run the installation process 
 
-   a. If you have the permission to write into directories `/usr/include` and `/usr/lib`, run the following command:
+   a. If you have the permission to write into directories <i>/usr/include</i> and <i>/usr/lib</i>, run the following command: 
 
           make install   
-
+   b. If you do not have this permission, you need to modify file *FREEIMAGE_SRC_DIR/Makefile.gnu*: 
-   b. If you do not have this permission, you need to modify file `FREEIMAGE_SRC_DIR/Makefile.gnu`:
   
       Change lines 7-9 from:
   
@@ -358,7 +410,7 @@ The directory with unpacked sources is  further referred to as `FREEIMAGE_SRC_DI
           install  -m 755 $(STATICLIB) $(INSTALLDIR)   
           install  -m 755 $(SHAREDLIB) $(INSTALLDIR)
 
-      Change line 70 from:
+      Change line 70 from: 
 
           ldconfig
 
@@ -376,128 +428,148 @@ The directory with unpacked sources is  further referred to as `FREEIMAGE_SRC_DI
 
 @subsection dev_guides__building_3rdparty_linux_3_4 VTK
 
+You can download VTK sources from https://www.vtk.org/VTK/resources/software.html
+
+### The building procedure:
+
 Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it.
 
-1. Install or build `cmake` product from the source file.
+1. Install or build *cmake* product from the source file.
-2. Start `cmake` in GUI mode with the directory where the source files of *VTK* are located:
+2. Start *cmake* in GUI mode with the directory where the source files of *VTK* are located:
 
        ccmake VTK_SRC_DIR
 
-   * Press `[c]` to make the initial configuration
+   * Press <i>[c]</i> to make the  initial configuration
-   * Define the necessary options in `VTK_INSTALL_PREFIX`
+   * Define the necessary options in *VTK_INSTALL_PREFIX*
-   * Press `[c]` to make the final configuration
+   * Press <i>[c]</i> to make the final  configuration
-   * Press `[g]` to generate `Makefile` and exit
+   * Press <i>[g]</i> to generate  Makefile and exit
 
 3. Start the building of VTK:
 
        make
 
-4. Start the installation of VTK. Binaries will be installed according to the `VTK_INSTALL_PREFIX` option.
+4. Start the installation of VTK. Binaries will be installed according to the *VTK_INSTALL_PREFIX* option.
 
        make install
 
 @section build_3rdparty_macos Mac OS X
 
-This section presents additional guidelines for building third-party products
+This document presents additional guidelines for building third-party products 
-used by Open CASCADE Technology and samples on Mac OS X platform (10.6.4 and later).
+used by Open CASCADE Technology and samples on Mac OS X platform (10.6.4  and later). 
 
-@subsection dev_guides__building_3rdparty_osx_2_1 Tcl/Tk
+The links for downloading the third-party products are available at https://opencascade.com/content/3rd-party-components.
 
-Tcl/Tk is required for DRAW test harness.
+There are two types of third-party products, which are  necessary to build OCCT: 
   
-**Installation from sources: Tcl**
+* Mandatory  products: 
+	* Tcl/Tk 8.5 - 8.6;
+	* FreeType 2.4.10 - 2.5.3.
+* Optional  products: 
+	* TBB 3.x - 4.x;
+	* FreeImage 3.14.1 - 3.16.0
+  
+
+@subsection dev_guides__building_3rdparty_osx_2_1 Tcl/Tk 8.5 
+
+Tcl/Tk is required for DRAW test harness. Version 8.5 or  8.6 can be used with OCCT. 
+
+**Installation from sources: Tcl 8.5**
 
 Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
 
-1. Enter the `macosx` sub-directory of the directory where the Tcl source files are located (`TCL_SRC_DIR`).
+1. Enter the *macosx* sub-directory of the directory where the Tcl source files are located <i>(TCL_SRC_DIR)</i>. 
 
        cd TCL_SRC_DIR/macosx   
 
-2. Run the `configure` command
+2. Run the *configure* command 
 
        configure --enable-gcc  --enable-shared --enable-threads --prefix=TCL_INSTALL_DIR   
 
-   For a 64 bit platform also add `--enable-64bit` option to the command line.
+   For a 64 bit platform also add <i>--enable-64bit</i> option to the command line. 
 
-3. If the `configure` command has finished successfully, start the building process
+3. If the *configure* command has finished successfully, start the building process 
 
        make   
   
 4. If building is finished successfully, start the installation of Tcl. 
-   All binary and service files of the product will be copied to the directory defined by `TCL_INSTALL_DIR`.
+   All binary and service files of the product will be copied to the directory defined by *TCL_INSTALL_DIR*. 
 
        make install   
 
-**Installation from sources: Tk**
+**Installation from sources: Tk 8.5**
 
 Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
 
-1. Enter the `macosx` sub-directory of the directory where the source files of Tk are located (`TK_SRC_DIR`).
+1. Enter the *macosx* sub-directory of the directory where the  source files of Tk are located <i>(TK_SRC_DIR)</i>. 
 
        cd TK_SRC_DIR/macosx   
 
-2. Run the `configure` command, where `TCL_LIB_DIR` is `TCL_INSTALL_DIR/lib`
+2. Run the *configure* command, where TCL_LIB_DIR is  TCL_INSTALL_DIR/lib 
 
        configure --enable-gcc --enable-shared --enable-threads --with-tcl=TCL_LIB_DIR --prefix=TK_INSTALL_DIR   
 
-   For a 64 bit platform also add `--enable-64bit` option to the command line.
+	For a 64 bit platform also add <i>--enable-64bit</i> option to the  command line. 
 
-3. If the `configure` command has finished successfully, start the building process:
+3. If the *configure* command has finished successfully, start the building process:
 
        make   
 
-4. If the building has finished successfully, start the installation of Tk.
+4. If the building has finished successfully, start the  installation of Tk. All binary and service files of the product will be copied to the directory defined by *TK_INSTALL_DIR* (usually it is TCL_INSTALL_DIR) 
-   All binary and service files of the product will be copied to the directory defined by `TK_INSTALL_DIR` (usually it is `TCL_INSTALL_DIR`).
 
        make install   
 
-@subsection dev_guides__building_3rdparty_osx_2_2 FreeType
+@subsection dev_guides__building_3rdparty_osx_2_2 FreeType 2.4.10
   
 FreeType is required for text display in the 3D viewer. 
-Download the necessary archive from https://freetype.org/ and unpack it.
 
-1. Enter the directory where the source files of FreeType are located (`FREETYPE_SRC_DIR`).
+Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
+
+1. Enter the directory where the source files of FreeType  are located <i>(FREETYPE_SRC_DIR)</i>. 
 
        cd FREETYPE_SRC_DIR   
 
-2. Run the `configure` command
+2. Run the *configure* command 
   
        configure  --prefix=FREETYPE_INSTALL_DIR   
 
-   For a 64 bit platform also add `CFLAGS='-m64 -fPIC'  CPPFLAGS='-m64 -fPIC'` option to the command line.
+   For a 64 bit platform also add <i>CFLAGS='-m64 -fPIC'  CPPFLAGS='-m64 -fPIC'</i> option to the command line. 
 
-3. If the `configure` command has finished successfully, start the building process
+3. If the *configure* command has finished successfully, start  the building process 
 
        make   
 
 4. If building has finished successfully, start the installation of FreeType. 
-   All binary and service files of the product will be copied to the directory defined by `FREETYPE_INSTALL_DIR`.
+   All binary and service files of the product will be copied to the directory defined by *FREETYPE_INSTALL_DIR*.
 
        make install   
     
-@subsection dev_guides__building_3rdparty_osx_3_1 TBB
+@subsection dev_guides__building_3rdparty_osx_3_1 TBB 3.x or 4.x
 
-This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
+This third-party product is installed with binaries from the archive 
-Go to the **Download** page, find the release version you need (e.g. `tbb30_018oss`) and pick the archive for Mac OS X platform.
+that can be downloaded from https://github.com/intel/tbb.
-To install, unpack the downloaded archive of TBB product (`tbb30_018oss_osx.tgz`).
+Go to the **Download** page, find the release version you need (e.g. *tbb30_018oss*) 
+and  pick the archive for Mac OS X platform. 
+To install, unpack the downloaded archive of TBB 3.0 product (*tbb30_018oss_osx.tgz*).
 
-@subsection dev_guides__building_3rdparty_osx_3_3 FreeImage
+@subsection dev_guides__building_3rdparty_osx_3_3 FreeImage 3.14.1 or 3.15.x
 
 Download the necessary archive from 
 https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
-and unpack it. The directory with unpacked sources is further referred to as `FREEIMAGE_SRC_DIR`.
+and unpack it. The directory with unpacked sources is  further referred to as *FREEIMAGE_SRC_DIR*.  
 
-Note that for building FreeImage on Mac OS X 10.7 you should replace `Makefile.osx`
+Note that for building FreeImage on Mac OS X 10.7 you should replace *Makefile.osx* 
-in `FREEIMAGE_SRC_DIR` by the corrected file, which you can find in attachment to issue [`#22811`](https://tracker.dev.opencascade.org/file_download.php?file_id=6937&type=bug) in OCCT Mantis bug tracker.
+in *FREEIMAGE_SRC_DIR* by the corrected file, which you can find in attachment to issue #22811 in OCCT Mantis bug tracker 
+(https://tracker.dev.opencascade.org/file_download.php?file_id=6937&type=bug).
 
-1. If you build FreeImage 3.15.x you can skip this step.
+1. If you build FreeImage 3.15.x you can skip this  step. 
+   Modify <i>FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h:</i> 
   
-   Modify `FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h:`<br>
    In line 60 insert the following: 
 
        #include string.h 
 
-   Modify `FREEIMAGE_SRC_DIR/Source/FreeImage/PluginTARGA.cpp`:<br>
+   Modify <i>FREEIMAGE_SRC_DIR/Source/FreeImage/PluginTARGA.cpp:</i> 
+  
    In line 320 replace: 
 
        SwapShort(value); 
@@ -506,7 +578,7 @@ in `FREEIMAGE_SRC_DIR` by the corrected file, which you can find in attachment t
 
        SwapShort(&value); 
 
-2. Enter the directory where the source files of FreeImage are located (`FREEIMAGE_SRC_DIR`).
+2. Enter the directory where the source files of FreeImage  are located <i>(FREEIMAGE_SRC_DIR)</i>. 
 
        cd FREEIMAGE_SRC_DIR 
 
@@ -516,12 +588,13 @@ in `FREEIMAGE_SRC_DIR` by the corrected file, which you can find in attachment t
 
 4. Run the installation process 
    
-   1. If you have the permission to write into `/usr/local/include` and `/usr/local/lib` directories, run the following command:
+   1. If you have the permission to write into <i>/usr/local/include</i>  and <i>/usr/local/lib</i> directories, run the following command: 
 
           make install   
 
-   2. If you do not have this permission, you need to modify file `FREEIMAGE_SRC_DIR/Makefile.osx`:<br>
+   2. If you do not have this permission, you need to modify file *FREEIMAGE_SRC_DIR/Makefile.osx*: 
-      Change line 49 from:
+
+      Change line 49 from:     
 
           PREFIX ?= /usr/local
 

samples/OCCTOverview/code/Sample2D_Image.cxx

@@ -26,7 +26,9 @@
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <gp_Pnt.hxx>
-#include <Graphic3d_Texture2D.hxx>
+#include <Graphic3d_Texture1D.hxx>
+#include <Graphic3d_Texture1Dsegment.hxx>
+#include <Graphic3d_Texture2Dmanual.hxx>
 #include <Image_AlienPixMap.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <TopoDS_Edge.hxx>
@@ -79,7 +81,7 @@ void Sample2D_Image::SetContext (const Handle(AIS_InteractiveContext)& theContex
   this->Set(TopoDS_Shape(myFace));
 
   myDrawer->SetShadingAspect(new Prs3d_ShadingAspect());
-  Handle(Graphic3d_Texture2D) aTexture = new Graphic3d_Texture2D (myFilename);
+  Handle(Graphic3d_Texture2Dmanual) aTexture = new Graphic3d_Texture2Dmanual(myFilename);
   aTexture->DisableModulate();
   myDrawer->ShadingAspect()->Aspect()->SetTextureMap (aTexture);
   myDrawer->ShadingAspect()->Aspect()->SetTextureMapOn();

src/AIS/AIS_TexturedShape.cxx

@@ -22,7 +22,7 @@
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_StructureManager.hxx>
-#include <Graphic3d_Texture2D.hxx>
+#include <Graphic3d_Texture2Dmanual.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <Prs3d_Drawer.hxx>
@@ -278,17 +278,17 @@ void AIS_TexturedShape::updateAttributes (const Handle(Prs3d_Presentation)& theP
     TCollection_AsciiString aTextureDesc;
     if (!myTexturePixMap.IsNull())
     {
-      myTexture = new Graphic3d_Texture2D (myTexturePixMap);
+      myTexture = new Graphic3d_Texture2Dmanual (myTexturePixMap);
       aTextureDesc = " (custom image)";
     }
     else if (myPredefTexture != Graphic3d_NOT_2D_UNKNOWN)
     {
-      myTexture = new Graphic3d_Texture2D (myPredefTexture);
+      myTexture = new Graphic3d_Texture2Dmanual (myPredefTexture);
       aTextureDesc = TCollection_AsciiString(" (predefined texture ") + myTexture->GetId() + ")";
     }
     else
     {
-      myTexture = new Graphic3d_Texture2D (myTextureFile.ToCString());
+      myTexture = new Graphic3d_Texture2Dmanual (myTextureFile.ToCString());
       aTextureDesc = TCollection_AsciiString(" (") + myTextureFile + ")";
     }
 

src/AIS/AIS_TexturedShape.hxx

@@ -26,7 +26,7 @@
 #include <PrsMgr_PresentationManager.hxx>
 
 class Graphic3d_AspectFillArea3d;
-class Graphic3d_Texture2D;
+class Graphic3d_Texture2Dmanual;
 
 //! This class allows to map textures on shapes.
 //! Presentations modes AIS_WireFrame (0) and AIS_Shaded (1) behave in the same manner as in AIS_Shape,
@@ -184,7 +184,7 @@ protected: //! @name overridden methods
 
 protected: //! @name presentation fields
 
-  Handle(Graphic3d_Texture2D)        myTexture;
+  Handle(Graphic3d_Texture2Dmanual)  myTexture;
   Handle(Graphic3d_AspectFillArea3d) myAspect;
 
 protected: //! @name texture source fields

src/AIS/AIS_XRTrackedDevice.cxx

@@ -23,14 +23,14 @@
 #include <SelectMgr_EntityOwner.hxx>
 
 //! Texture holder.
-class AIS_XRTrackedDevice::XRTexture : public Graphic3d_Texture2D
+class AIS_XRTrackedDevice::XRTexture : public Graphic3d_Texture2Dmanual
 {
 public:
 
   //! Constructor.
   XRTexture (const Handle(Image_Texture)& theImageSource,
              const Graphic3d_TextureUnit theUnit = Graphic3d_TextureUnit_BaseColor)
-  : Graphic3d_Texture2D (""), myImageSource (theImageSource)
+  : Graphic3d_Texture2Dmanual (""), myImageSource (theImageSource)
   {
     if (!theImageSource->TextureId().IsEmpty())
     {

src/Adaptor3d/Adaptor3d_Surface.hxx

@@ -116,16 +116,15 @@ public:
   Standard_EXPORT virtual Standard_Real VPeriod() const;
   
   //! Computes the point of parameters U,V on the surface.
-  //! Tip: use GeomLib::NormEstim() to calculate surface normal at specified (U, V) point.
   Standard_EXPORT virtual gp_Pnt Value (const Standard_Real U, const Standard_Real V) const;
   
   //! Computes the point of parameters U,V on the surface.
   Standard_EXPORT virtual void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const;
   
-  //! Computes the point  and the first derivatives on the surface.
+  //! Computes the point  and the first derivatives on
-  //! Raised if the continuity of the current intervals is not C1.
+  //! the surface.
-  //!
+  //! Raised   if  the continuity  of   the  current
-  //! Tip: use GeomLib::NormEstim() to calculate surface normal at specified (U, V) point.
+  //! intervals is not C1.
   Standard_EXPORT virtual void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const;
   
   //! Computes   the point,  the  first  and  second

src/BRepAdaptor/BRepAdaptor_Surface.hxx

@@ -141,16 +141,15 @@ public:
   virtual Standard_Real VPeriod() const Standard_OVERRIDE { return mySurf.VPeriod(); }
 
   //! Computes the point of parameters U,V on the surface.
-  //! Tip: use GeomLib::NormEstim() to calculate surface normal at specified (U, V) point.
   Standard_EXPORT gp_Pnt Value (const Standard_Real U, const Standard_Real V) const Standard_OVERRIDE;
   
   //! Computes the point of parameters U,V on the surface.
   Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE;
   
-  //! Computes the point  and the first derivatives on the surface.
+  //! Computes the point  and the first derivatives on
-  //! Raised if the continuity of the current intervals is not C1.
+  //! the surface.
-  //!
+  //! Raised   if  the continuity  of   the  current
-  //! Tip: use GeomLib::NormEstim() to calculate surface normal at specified (U, V) point.
+  //! intervals is not C1.
   Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE;
   
   //! Computes   the point,  the  first  and  second

src/BRepCheck/BRepCheck_Edge.cxx

@@ -316,7 +316,6 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
       BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
       Standard_Real eps = Precision::PConfusion();
       Standard_Boolean toRunParallel = !myMutex.IsNull();
-      const Handle(Adaptor3d_Curve)& aLocalHCurve = GetEdgeCurve(TopoDS::Face(S));
       while (itcr.More()) {
         const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
         if (cr != myCref && cr->IsCurveOnSurface(Su,L)) {
@@ -373,13 +372,13 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
             Handle(Geom_Surface) Sb = cr->Surface();
             Sb = Handle(Geom_Surface)::DownCast
               //	      (Su->Transformed(L.Transformation()));
-              (Su->Transformed(/*L*/TFloc.Transformation()));
+              (Su->Transformed(/*L*/(Floc * TFloc).Transformation()));
             Handle(Geom2d_Curve) PC = cr->PCurve();
             Handle(GeomAdaptor_Surface) GAHS = new GeomAdaptor_Surface(Sb);
             Handle(Geom2dAdaptor_Curve) GHPC = new Geom2dAdaptor_Curve(PC,f,l);
             Handle(Adaptor3d_CurveOnSurface) ACS = new Adaptor3d_CurveOnSurface(GHPC,GAHS);
 
-            BRepLib_ValidateEdge aValidateEdge(aLocalHCurve, ACS, SameParameter);
+            BRepLib_ValidateEdge aValidateEdge(myHCurve, ACS, SameParameter);
             aValidateEdge.SetExitIfToleranceExceeded(Tol);
             aValidateEdge.SetExactMethod(myIsExactMethod);
             aValidateEdge.SetParallel(toRunParallel);
@@ -403,7 +402,7 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
               GHPC->Load(cr->PCurve2(),f,l); // same bounds
               ACS->Load(GHPC, GAHS); // sans doute inutile
 
-              BRepLib_ValidateEdge aValidateEdgeOnClosedSurf(aLocalHCurve, ACS, SameParameter);
+              BRepLib_ValidateEdge aValidateEdgeOnClosedSurf(myHCurve, ACS, SameParameter);
               aValidateEdgeOnClosedSurf.SetExitIfToleranceExceeded(Tol);
               aValidateEdgeOnClosedSurf.SetExactMethod(myIsExactMethod);
               aValidateEdgeOnClosedSurf.SetParallel(toRunParallel);
@@ -441,12 +440,12 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
           // plan en position
           if (myGctrl) {
             P = Handle(Geom_Plane)::
-              DownCast(P->Transformed(/*L*/TFloc.Transformation()));// eap occ332
+              DownCast(P->Transformed(/*L*/(Floc * TFloc).Transformation()));// eap occ332
             //on projette Cref sur ce plan
             Handle(GeomAdaptor_Surface) GAHS = new GeomAdaptor_Surface(P);
 
-            // Dub - Normalement aLocalHCurve est une GeomAdaptor_Curve
+            // Dub - Normalement myHCurve est une GeomAdaptor_Curve
-            Handle(GeomAdaptor_Curve) Gac = Handle(GeomAdaptor_Curve)::DownCast(aLocalHCurve);
+            Handle(GeomAdaptor_Curve) Gac = Handle(GeomAdaptor_Curve)::DownCast(myHCurve);
             Handle(Geom_Curve) C3d = Gac->Curve();
             Handle(Geom_Curve) ProjOnPlane = 
               GeomProjLib::ProjectOnPlane(new Geom_TrimmedCurve(C3d,First,Last),
@@ -459,12 +458,12 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
             Handle(Geom2d_Curve) PC = Geom2dAdaptor::MakeCurve(proj);
             Handle(Geom2dAdaptor_Curve) GHPC = 
               new Geom2dAdaptor_Curve(PC,
-              aLocalHCurve->FirstParameter(),
+              myHCurve->FirstParameter(),
-              aLocalHCurve->LastParameter());
+              myHCurve->LastParameter());
 
             Handle(Adaptor3d_CurveOnSurface) ACS = new Adaptor3d_CurveOnSurface(GHPC,GAHS);
 
-            BRepLib_ValidateEdge aValidateEdgeProj(aLocalHCurve, ACS, SameParameter);
+            BRepLib_ValidateEdge aValidateEdgeProj(myHCurve, ACS, SameParameter);
             aValidateEdgeProj.SetExitIfToleranceExceeded(Tol);
             aValidateEdgeProj.SetExactMethod(myIsExactMethod);
             aValidateEdgeProj.SetParallel(toRunParallel);
@@ -666,50 +665,6 @@ Standard_Real BRepCheck_Edge::Tolerance()
 }
 
 
-//=======================================================================
-//function : GetEdgeCurve
-//purpose  : 
-//=======================================================================
-
-Handle(Adaptor3d_Curve) BRepCheck_Edge::GetEdgeCurve(const TopoDS_Face& theFace)
-{
-  Handle(Adaptor3d_Curve) aLocalCurve;
-  Handle(BRep_GCurve) GCref(Handle(BRep_GCurve)::DownCast(myCref));
-  Standard_Real First, Last;
-  GCref->Range(First, Last);
-  if (myCref->IsCurve3D())
-  {
-    TopLoc_Location aLoc = !theFace.IsNull()
-                         ? (myShape.Location() * myCref->Location()).Predivided(theFace.Location())
-                         : myShape.Location() * myCref->Location();
-    Handle(Geom_Curve) C3d = Handle(Geom_Curve)::DownCast
-      (myCref->Curve3D()->Transformed
-      (aLoc.Transformation()));
-
-    GeomAdaptor_Curve GAC3d(C3d, C3d->TransformedParameter(First, aLoc.Transformation()),
-                               C3d->TransformedParameter(Last, aLoc.Transformation()));
-    aLocalCurve = new GeomAdaptor_Curve(GAC3d);
-  }
-  else // curve on surface
-  {
-    TopLoc_Location aFaceLoc = theFace.Location();
-    Handle(Geom_Surface) Sref = myCref->Surface();
-    Sref = !theFace.IsNull()
-           ? Handle(Geom_Surface)::DownCast(Sref->Transformed(myCref->Location().Predivided(aFaceLoc).Transformation()))
-           : Handle(Geom_Surface)::DownCast(Sref->Transformed(myCref->Location().Transformation()));
-
-    const Handle(Geom2d_Curve)& PCref = myCref->PCurve();
-    Handle(GeomAdaptor_Surface) GAHSref = new GeomAdaptor_Surface(Sref);
-    Handle(Geom2dAdaptor_Curve) GHPCref =
-      new Geom2dAdaptor_Curve(PCref, First, Last);
-    Adaptor3d_CurveOnSurface ACSref(GHPCref, GAHSref);
-    aLocalCurve = new Adaptor3d_CurveOnSurface(ACSref);
-  }
-  
-    return aLocalCurve;
-  }
-
-
 //=======================================================================
 //function : CheckPolygonOnTriangulation
 //purpose  : 

src/BRepCheck/BRepCheck_Edge.hxx

@@ -23,7 +23,6 @@
 
 class BRep_CurveRepresentation;
 class TopoDS_Edge;
-class TopoDS_Face;
 class TopoDS_Shape;
 
 class BRepCheck_Edge;
@@ -50,11 +49,6 @@ public:
   
   Standard_EXPORT Standard_Real Tolerance();
   
-  //! Creates a 3d curve or curve on surface by subtracting the location of the face
-  //! @param[in] theFace input face to get the location from it
-  //! @return a 3d curve or curve on surface
-  Standard_EXPORT Handle(Adaptor3d_Curve) GetEdgeCurve (const TopoDS_Face& theFace);
-  
   //! Sets status of Edge;
   Standard_EXPORT void SetStatus (const BRepCheck_Status theStatus);
 

src/BRepLib/BRepLib.cxx

@@ -1960,12 +1960,6 @@ public:
     return aDeriv.Transformed(mySurfaceTrsf);
   }
 
-  gp_Dir Normal()
-  {
-    gp_Dir aNormal = mySurfaceProps.Normal();
-    return aNormal.Transformed(mySurfaceTrsf);
-  }
-
   // Calculate principal curvatures, which consist of minimal and maximal normal curvatures and
   // the directions on the tangent plane (principal direction) where the extremums are reached
   void Curvature(gp_Dir& thePrincipalDir1, Standard_Real& theCurvature1,
@@ -2004,63 +1998,32 @@ private:
 //purpose  : check the angle at the border between two squares.
 //           Two shares should have a shared front edge.
 //=======================================================================
-GeomAbs_Shape BRepLib::ContinuityOfFaces(const TopoDS_Edge&  theEdge,
+static GeomAbs_Shape tgtfaces(const TopoDS_Edge& Ed,
-                                         const TopoDS_Face&  theFace1,
+                              const TopoDS_Face& F1,
-                                         const TopoDS_Face&  theFace2,
+                              const TopoDS_Face& F2,
-                                         const Standard_Real theAngleTol)
+                              const Standard_Real theAngleTol)
 {
-  Standard_Boolean isSeam = theFace1.IsEqual(theFace2);
+  Standard_Boolean isSeam = F1.IsEqual(F2);
 
-  TopoDS_Edge anEdgeInFace1, anEdgeInFace2;
+  TopoDS_Edge E = Ed;
-  Handle(Geom2d_Curve) aCurve1, aCurve2;
 
-  Standard_Real aFirst, aLast;
+  // Check if pcurves exist on both faces of edge
+  Standard_Real aFirst,aLast;
+  E.Orientation(TopAbs_FORWARD);
+  Handle(Geom2d_Curve) aCurve1 = BRep_Tool::CurveOnSurface(E, F1, aFirst, aLast);
+  if(aCurve1.IsNull())
+    return GeomAbs_C0;
 
-  if (!theFace1.IsSame (theFace2) &&
+  if (isSeam)
-      BRep_Tool::IsClosed (theEdge, theFace1) &&
+    E.Orientation(TopAbs_REVERSED);
-      BRep_Tool::IsClosed (theEdge, theFace2))
+  Handle(Geom2d_Curve) aCurve2 = BRep_Tool::CurveOnSurface(E, F2, aFirst, aLast);
-  {
+  if(aCurve2.IsNull())
-    //Find the edge in the face 1: this edge will have correct orientation
-    TopoDS_Face aFace1 = theFace1;
-    aFace1.Orientation (TopAbs_FORWARD);
-    TopExp_Explorer anExplo (aFace1, TopAbs_EDGE);
-    for (; anExplo.More(); anExplo.Next())
-    {
-      const TopoDS_Edge& anEdge = TopoDS::Edge (anExplo.Current());
-      if (anEdge.IsSame (theEdge))
-      {
-        anEdgeInFace1 = anEdge;
-        break;
-      }
-    }
-    if (anEdgeInFace1.IsNull())
-      return GeomAbs_C0;
-    
-    aCurve1 = BRep_Tool::CurveOnSurface (anEdgeInFace1, aFace1, aFirst, aLast);
-    TopoDS_Face aFace2 = theFace2;
-    aFace2.Orientation (TopAbs_FORWARD);
-    anEdgeInFace2 = anEdgeInFace1;
-    anEdgeInFace2.Reverse();
-    aCurve2 = BRep_Tool::CurveOnSurface (anEdgeInFace2, aFace2, aFirst, aLast);
-  }
-  else
-  {
-    // Obtaining of pcurves of edge on two faces.
-    anEdgeInFace1 = anEdgeInFace2 = theEdge;
-    aCurve1 = BRep_Tool::CurveOnSurface (anEdgeInFace1, theFace1, aFirst, aLast);
-    //For the case of seam edge
-    if (theFace1.IsSame(theFace2))
-      anEdgeInFace2.Reverse();
-    aCurve2 = BRep_Tool::CurveOnSurface (anEdgeInFace2, theFace2, aFirst, aLast);
-  }
-
-  if (aCurve1.IsNull() || aCurve2.IsNull())
     return GeomAbs_C0;
 
   TopLoc_Location aLoc1, aLoc2;
-  Handle(Geom_Surface) aSurface1 = BRep_Tool::Surface (theFace1, aLoc1);
+  Handle(Geom_Surface) aSurface1 = BRep_Tool::Surface(F1, aLoc1);
   const gp_Trsf& aSurf1Trsf = aLoc1.Transformation();
-  Handle(Geom_Surface) aSurface2 = BRep_Tool::Surface (theFace2, aLoc2);
+  Handle(Geom_Surface) aSurface2 = BRep_Tool::Surface(F2, aLoc2);
   const gp_Trsf& aSurf2Trsf = aLoc2.Transformation();
 
   if (aSurface1->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface)))
@@ -2077,11 +2040,11 @@ GeomAbs_Shape BRepLib::ContinuityOfFaces(const TopoDS_Edge&  theEdge,
     return GeomAbs_CN;
   }
 
-  SurfaceProperties aSP1(aSurface1, aSurf1Trsf, aCurve1, theFace1.Orientation() == TopAbs_REVERSED);
+  SurfaceProperties aSP1(aSurface1, aSurf1Trsf, aCurve1, F1.Orientation() == TopAbs_REVERSED);
-  SurfaceProperties aSP2(aSurface2, aSurf2Trsf, aCurve2, theFace2.Orientation() == TopAbs_REVERSED);
+  SurfaceProperties aSP2(aSurface2, aSurf2Trsf, aCurve2, F2.Orientation() == TopAbs_REVERSED);
 
   Standard_Real f, l, eps;
-  BRep_Tool::Range (theEdge,f,l);
+  BRep_Tool::Range(E,f,l);
   Extrema_LocateExtPC ext;
   Handle(BRepAdaptor_Curve) aHC2;
 
@@ -2092,6 +2055,7 @@ GeomAbs_Shape BRepLib::ContinuityOfFaces(const TopoDS_Edge&  theEdge,
   const Standard_Real anAngleTol2 = theAngleTol * theAngleTol;
 
   gp_Vec aDer1, aDer2;
+  gp_Vec aNorm1;
   Standard_Real aSqLen1, aSqLen2;
   gp_Dir aCrvDir1[2], aCrvDir2[2];
   Standard_Real aCrvLen1[2], aCrvLen2[2];
@@ -2119,26 +2083,13 @@ GeomAbs_Shape BRepLib::ContinuityOfFaces(const TopoDS_Edge&  theEdge,
     aDer2 = aSP2.Derivative();
     aSqLen2 = aDer2.SquareMagnitude();
     Standard_Boolean isSmoothSuspect = (aDer1.CrossSquareMagnitude(aDer2) <= anAngleTol2 * aSqLen1 * aSqLen2);
-    if (isSmoothSuspect)
-    {
-      gp_Dir aNormal1 = aSP1.Normal();
-      if (theFace1.Orientation() == TopAbs_REVERSED)
-        aNormal1.Reverse();
-      gp_Dir aNormal2 = aSP2.Normal();
-      if (theFace2.Orientation() == TopAbs_REVERSED)
-        aNormal2.Reverse();
-      
-      if (aNormal1 * aNormal2 < 0.)
-        return GeomAbs_C0;
-    }
-    
     if (!isSmoothSuspect)
     {
       // Refine by projection
       if (aHC2.IsNull())
       {
         // adaptor for pcurve on the second surface
-        aHC2 = new BRepAdaptor_Curve (anEdgeInFace2, theFace2);
+        aHC2 = new BRepAdaptor_Curve (E, F2);
         ext.Initialize(*aHC2, f, l, Precision::PConfusion());
       }
       ext.Perform(aSP1.Value(), u);
@@ -2334,8 +2285,9 @@ void BRepLib::EncodeRegularity(TopoDS_Edge& E,
   BRep_Builder B;
   if(BRep_Tool::Continuity(E,F1,F2)<=GeomAbs_C0){
     try {
-      GeomAbs_Shape aCont = ContinuityOfFaces(E, F1, F2, TolAng);
+      GeomAbs_Shape aCont = tgtfaces(E, F1, F2, TolAng);
       B.Continuity(E,F1,F2,aCont);
+      
     }
     catch(Standard_Failure const&)
     {

src/BRepLib/BRepLib.hxx

@@ -203,13 +203,6 @@ public:
   //! False if the solid is unOrientable (open or incoherent)
   Standard_EXPORT static Standard_Boolean OrientClosedSolid (TopoDS_Solid& solid);
   
-  //! Returns the order of continuity between two faces
-  //! connected by an edge
-  Standard_EXPORT static GeomAbs_Shape ContinuityOfFaces(const TopoDS_Edge&  theEdge,
-                                                         const TopoDS_Face&  theFace1,
-                                                         const TopoDS_Face&  theFace2,
-                                                         const Standard_Real theAngleTol);
-
   //! Encodes the Regularity of edges on a Shape.
   //! Warning: <TolAng> is an angular tolerance, expressed in Rad.
   //! Warning: If the edges's regularity are coded before, nothing

src/BRepMesh/BRepMesh_IncrementalMesh.cxx

@@ -48,7 +48,8 @@ BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh( const TopoDS_Shape&    theSh
                                                     const Standard_Real    theLinDeflection,
                                                     const Standard_Boolean isRelative,
                                                     const Standard_Real    theAngDeflection,
-                                                    const Standard_Boolean isInParallel)
+                                                    const Standard_Boolean isInParallel, 
+                                                    const Message_ProgressRange& theRange)
 : myModified(Standard_False),
   myStatus(IMeshData_NoError)
 {
@@ -58,7 +59,7 @@ BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh( const TopoDS_Shape&    theSh
   myParameters.InParallel = isInParallel;
 
   myShape = theShape;
-  Perform();
+  Perform(theRange);
 }
 
 //=======================================================================

src/BRepMesh/BRepMesh_IncrementalMesh.hxx

@@ -43,7 +43,8 @@ public: //! @name mesher API
                                            const Standard_Real    theLinDeflection,
                                            const Standard_Boolean isRelative = Standard_False,
                                            const Standard_Real    theAngDeflection = 0.5,
-                                           const Standard_Boolean isInParallel = Standard_False);
+                                           const Standard_Boolean isInParallel = Standard_False,
+                                           const Message_ProgressRange& theRange = Message_ProgressRange());
 
   //! Constructor.
   //! Automatically calls method Perform.

src/BRepTools/BRepTools.cxx

@@ -695,7 +695,7 @@ Standard_Boolean  BRepTools::Write (const TopoDS_Shape& theShape,
                                     const Message_ProgressRange& theProgress)
 {
   const Handle(OSD_FileSystem)& aFileSystem = OSD_FileSystem::DefaultFileSystem();
-  std::shared_ptr<std::ostream> aStream = aFileSystem->OpenOStream (theFile, std::ios::out | std::ios::binary);
+  std::shared_ptr<std::ostream> aStream = aFileSystem->OpenOStream (theFile, std::ios::out);
   if (aStream.get() == NULL || !aStream->good())
   {
     return Standard_False;

src/BndLib/BndLib_Add3dCurve.cxx

@@ -217,7 +217,7 @@ void BndLib_Add3dCurve::Add( const Adaptor3d_Curve& C,
 	  if(Bsaux->LastParameter()  < U2 ) u2  = Bsaux->LastParameter();
 	  //  modified by NIZHNY-EAP Fri Dec  3 14:29:18 1999 ___END___
 	}
-        Standard_Real aSegmentTol = 2. * Precision::PConfusion();
+        Standard_Real aSegmentTol = Precision::PConfusion();
         if (Abs(u2 - u1) < aSegmentTol)
           aSegmentTol = Abs(u2 - u1) * 0.01;
 	Bsaux->Segment(u1, u2, aSegmentTol);

src/CDF/CDF_Store.cxx

@@ -78,11 +78,19 @@ Standard_Boolean  CDF_Store::SetFolder(const Standard_ExtString aFolder) {
 Standard_Boolean  CDF_Store::SetFolder(const TCollection_ExtendedString& aFolder) {
 
   TCollection_ExtendedString theFolder(aFolder);
-  Standard_Integer aLen = theFolder.Length();
+  Standard_Integer l = theFolder.Length();
 
-  // if the last character is the folder separator, remove it.
+  // if the last character is the folder separator (which is always the first character)
-  if (aLen > 1 && (theFolder.Value(aLen) == '/' || theFolder.Value(aLen) == '\\'))
+  // it is removed.
-    theFolder.Trunc(aLen-1);
+	// This is correct for Unix systems but not for Windows! VMS and MAC? Thomas Haller, 23.11.01
+  if(l > 1) {
+#ifndef _WIN32
+    if(theFolder.Value(l) == theFolder.Value(1)) theFolder.Trunc(l-1);
+#else
+	if (theFolder.Value(l) == '/' || theFolder.Value(l) == '\\')
+		theFolder.Trunc(l-1);
+#endif
+  }
 
   if(theMetaDataDriver->FindFolder(theFolder))  {
     myCurrentDocument->SetRequestedFolder(theFolder);

src/ChFi3d/ChFi3d.cxx

@@ -134,12 +134,12 @@ ChFiDS_TypeOfConcavity ChFi3d::DefineConnectType(const TopoDS_Edge&     E,
 //function : IsTangentFaces
 //purpose  : 
 //=======================================================================
-Standard_Boolean ChFi3d::IsTangentFaces(const TopoDS_Edge&  theEdge,
+Standard_Boolean ChFi3d::IsTangentFaces(const TopoDS_Edge& theEdge,
-                                        const TopoDS_Face&  theFace1,
+                                        const TopoDS_Face& theFace1,
-                                        const TopoDS_Face&  theFace2,
+                                        const TopoDS_Face& theFace2,
-                                        const GeomAbs_Shape theOrder)
+                                        const GeomAbs_Shape Order)
 {
-  if (theOrder == GeomAbs_G1 && BRep_Tool::Continuity(theEdge, theFace1, theFace2) != GeomAbs_C0)
+  if (Order == GeomAbs_G1 && BRep_Tool::Continuity(theEdge, theFace1, theFace2) != GeomAbs_C0)
     return Standard_True;
 
   Standard_Real TolC0 = Max(0.001, 1.5*BRep_Tool::Tolerance(theEdge));
@@ -147,46 +147,15 @@ Standard_Boolean ChFi3d::IsTangentFaces(const TopoDS_Edge&  theEdge,
   Standard_Real aFirst;
   Standard_Real aLast;
 
-  Handle(Geom2d_Curve) aC2d1, aC2d2;
+  // Obtaining of pcurves of edge on two faces.
-  
+  const Handle(Geom2d_Curve) aC2d1 = BRep_Tool::CurveOnSurface
-  if (!theFace1.IsSame (theFace2) &&
+    (theEdge, theFace1, aFirst, aLast);
-      BRep_Tool::IsClosed (theEdge, theFace1) &&
+  //For the case of seam edge
-      BRep_Tool::IsClosed (theEdge, theFace2))
+  TopoDS_Edge EE = theEdge;
-  {
+  if (theFace1.IsSame(theFace2))
-    //Find the edge in the face 1: this edge will have correct orientation
+    EE.Reverse();
-    TopoDS_Edge anEdgeInFace1;
+  const Handle(Geom2d_Curve) aC2d2 = BRep_Tool::CurveOnSurface
-    TopoDS_Face aFace1 = theFace1;
+    (EE, theFace2, aFirst, aLast);
-    aFace1.Orientation (TopAbs_FORWARD);
-    TopExp_Explorer anExplo (aFace1, TopAbs_EDGE);
-    for (; anExplo.More(); anExplo.Next())
-    {
-      const TopoDS_Edge& anEdge = TopoDS::Edge (anExplo.Current());
-      if (anEdge.IsSame (theEdge))
-      {
-        anEdgeInFace1 = anEdge;
-        break;
-      }
-    }
-    if (anEdgeInFace1.IsNull())
-      return Standard_False;
-    
-    aC2d1 = BRep_Tool::CurveOnSurface (anEdgeInFace1, aFace1, aFirst, aLast);
-    TopoDS_Face aFace2 = theFace2;
-    aFace2.Orientation (TopAbs_FORWARD);
-    anEdgeInFace1.Reverse();
-    aC2d2 = BRep_Tool::CurveOnSurface (anEdgeInFace1, aFace2, aFirst, aLast);
-  }
-  else
-  {
-    // Obtaining of pcurves of edge on two faces.
-    aC2d1 = BRep_Tool::CurveOnSurface (theEdge, theFace1, aFirst, aLast);
-    //For the case of seam edge
-    TopoDS_Edge EE = theEdge;
-    if (theFace1.IsSame(theFace2))
-      EE.Reverse();
-    aC2d2 = BRep_Tool::CurveOnSurface (EE, theFace2, aFirst, aLast);
-  }
-  
   if (aC2d1.IsNull() || aC2d2.IsNull())
     return Standard_False;
 
@@ -217,19 +186,15 @@ Standard_Boolean ChFi3d::IsTangentFaces(const TopoDS_Edge&  theEdge,
     if (i == aNbSamples) aPar = aLast;
 
     LocalAnalysis_SurfaceContinuity aCont(aC2d1, aC2d2, aPar,
-      aSurf1, aSurf2, theOrder,
+      aSurf1, aSurf2, Order,
       0.001, TolC0, 0.1, 0.1, 0.1);
     if (!aCont.IsDone())
     {
-      if (theOrder == GeomAbs_C2 &&
-          aCont.StatusError() == LocalAnalysis_NullSecondDerivative)
-        continue;
-      
       nbNotDone++;
       continue;
     }
 
-    if (theOrder == GeomAbs_G1)
+    if (Order == GeomAbs_G1)
     {
       if (!aCont.IsG1())
         return Standard_False;

src/ChFi3d/ChFi3d_Builder_C1.cxx

@@ -1997,7 +1997,6 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
       if ((possible1 && possible2) || (!possible1 && !possible2) || (nbarete > 4)) {
 	while (!trouve) {
 	  nb++;
-	  if (nb>=nn) throw Standard_Failure("IntersectionAtEnd : the max number of faces reached");
 	  if (nb!=1) F3=Face[nb-2];
 	  Face[nb-1]=F3;
 	  if (CV1.Arc().IsSame(edgelibre1))

src/D3DHost/D3DHost_FrameBuffer.cxx

@@ -195,7 +195,7 @@ Standard_Boolean D3DHost_FrameBuffer::InitD3dInterop (const Handle(OpenGl_Contex
 
   const OpenGl_TextureFormat aDepthFormat = OpenGl_TextureFormat::FindSizedFormat (theCtx, myDepthFormat);
   if (aDepthFormat.IsValid()
-  && !myDepthStencilTexture->Init (theCtx, aDepthFormat, Graphic3d_Vec2i (aSizeX, aSizeY), Graphic3d_TypeOfTexture_2D))
+  && !myDepthStencilTexture->Init (theCtx, aDepthFormat, Graphic3d_Vec2i (aSizeX, aSizeY), Graphic3d_TOT_2D))
   {
     Release (theCtx.get());
     theCtx->PushMessage (GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_ERROR, 0, GL_DEBUG_SEVERITY_HIGH,

src/Draw/Draw_VariableCommands.cxx

@@ -92,7 +92,7 @@ static Standard_Integer save (Draw_Interpretor& theDI,
 
   const char* aName = theArgVec[2];
   const Handle(OSD_FileSystem)& aFileSystem = OSD_FileSystem::DefaultFileSystem();
-  std::shared_ptr<std::ostream> aStream = aFileSystem->OpenOStream (aName, std::ios::out | std::ios::binary);
+  std::shared_ptr<std::ostream> aStream = aFileSystem->OpenOStream (aName, std::ios::out);
   aStream->precision (15);
   if (aStream.get() == NULL || !aStream->good())
   {

src/Extrema/Extrema_ExtCC.cxx

@@ -663,7 +663,7 @@ void Extrema_ExtCC::PrepareParallelResult(const Standard_Real theUt11,
       //    myIsParallel = TRUE and only the least distance will be returned.
       //4. Arcs are not parallel. Then several (or single) extremas will be returned.
 
-      if (aRng.Delta() > Precision::Confusion())
+      if (aRng.Delta() > Precision::Angular())
       {
         Standard_Real aPar = 0.0;
         aRng.GetIntermediatePoint(0.5, aPar);
@@ -703,6 +703,7 @@ void Extrema_ExtCC::PrepareParallelResult(const Standard_Real theUt11,
             break;
           }
         }
+
         //Nearer solution can be found
       }
       else if (!aRng.IsVoid())

src/Extrema/Extrema_GenExtCS.cxx

@@ -120,15 +120,6 @@ Extrema_GenExtCS::Extrema_GenExtCS()
 {
 }
 
-// =======================================================================
-// function : ~Extrema_GenExtCS
-// purpose  :
-// =======================================================================
-Extrema_GenExtCS::~Extrema_GenExtCS()
-{
-  //
-}
-
 //=======================================================================
 //function : Extrema_GenExtCS
 //purpose  : 

src/Extrema/Extrema_GenExtCS.hxx

@@ -35,11 +35,8 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  //! Empty constructor.
-  Standard_EXPORT Extrema_GenExtCS();
   
-  //! Destructor.
+  Standard_EXPORT Extrema_GenExtCS();
-  Standard_EXPORT ~Extrema_GenExtCS();
   
   //! It calculates all the distances.
   //! The function F(u,v)=distance(S1(u1,v1),S2(u2,v2)) has an

src/Extrema/Extrema_GenExtPS.cxx

@@ -224,19 +224,7 @@ Extrema_GenExtPS::Extrema_GenExtPS()
   myAlgo = Extrema_ExtAlgo_Grad;
 }
 
-// =======================================================================
-// function : ~Extrema_GenExtPS
-// purpose  :
-// =======================================================================
-Extrema_GenExtPS::~Extrema_GenExtPS()
-{
-  //
-}
 
-// =======================================================================
-// function : Extrema_GenExtPS
-// purpose  :
-// =======================================================================
 Extrema_GenExtPS::Extrema_GenExtPS (const gp_Pnt&          P,
                                     const Adaptor3d_Surface& S,
                                     const Standard_Integer NbU, 

src/Extrema/Extrema_GenExtPS.hxx

@@ -37,12 +37,8 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  //! Empty constructor.
   Standard_EXPORT Extrema_GenExtPS();
   
-  //! Destructor.
-  Standard_EXPORT ~Extrema_GenExtPS();
-
   //! It calculates all the distances.
   //! The function F(u,v)=distance(P,S(u,v)) has an
   //! extremum when gradient(F)=0. The algorithm searches

src/Extrema/Extrema_GenExtSS.cxx

@@ -118,15 +118,6 @@ Extrema_GenExtSS::Extrema_GenExtSS()
   myInit = Standard_False;
 }
 
-// =======================================================================
-// function : ~Extrema_GenExtSS
-// purpose  :
-// =======================================================================
-Extrema_GenExtSS::~Extrema_GenExtSS()
-{
-  //
-}
-
 //=======================================================================
 //function : Extrema_GenExtSS
 //purpose  : 

src/Extrema/Extrema_GenExtSS.hxx

@@ -36,11 +36,8 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  //! Empty constructor.
-  Standard_EXPORT Extrema_GenExtSS();
   
-  //! Destructor.
+  Standard_EXPORT Extrema_GenExtSS();
-  Standard_EXPORT ~Extrema_GenExtSS();
   
   //! It calculates all the distances.
   //! The function F(u,v)=distance(S1(u1,v1),S2(u2,v2)) has an

src/FEmTool/FEmTool_Assembly.cxx

@@ -16,9 +16,11 @@
 
 
 #include <FEmTool_Assembly.hxx>
+#include <FEmTool_ListIteratorOfListOfVectors.hxx>
 #include <FEmTool_ListOfVectors.hxx>
 #include <FEmTool_ProfileMatrix.hxx>
 #include <math_Matrix.hxx>
+#include <Standard_DimensionError.hxx>
 #include <Standard_DomainError.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColStd_HArray1OfReal.hxx>

src/FEmTool/FEmTool_Assembly.hxx

@@ -23,6 +23,7 @@
 
 #include <TColStd_Array2OfInteger.hxx>
 #include <FEmTool_HAssemblyTable.hxx>
+#include <Standard_Boolean.hxx>
 #include <math_Vector.hxx>
 #include <FEmTool_SeqOfLinConstr.hxx>
 #include <TColStd_SequenceOfReal.hxx>

src/FEmTool/FEmTool_Curve.cxx

@@ -20,8 +20,10 @@
 
 #include <FEmTool_Curve.hxx>
 #include <PLib.hxx>
+#include <PLib_Base.hxx>
 #include <PLib_HermitJacobi.hxx>
 #include <PLib_JacobiPolynomial.hxx>
+#include <Standard_DimensionError.hxx>
 #include <Standard_Type.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(FEmTool_Curve,Standard_Transient)

src/FEmTool/FEmTool_ElementaryCriterion.cxx

@@ -17,6 +17,8 @@
 
 #include <FEmTool_ElementaryCriterion.hxx>
 #include <math_Matrix.hxx>
+#include <Standard_DomainError.hxx>
+#include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(FEmTool_ElementaryCriterion,Standard_Transient)

src/FEmTool/FEmTool_ElementaryCriterion.hxx

@@ -18,6 +18,7 @@
 #define _FEmTool_ElementaryCriterion_HeaderFile
 
 #include <Standard.hxx>
+#include <Standard_Type.hxx>
 
 #include <TColStd_HArray2OfReal.hxx>
 #include <Standard_Real.hxx>

src/FEmTool/FEmTool_ElementsOfRefMatrix.hxx

@@ -23,6 +23,7 @@
 
 #include <Standard_Integer.hxx>
 #include <math_FunctionSet.hxx>
+#include <Standard_Boolean.hxx>
 #include <math_Vector.hxx>
 class PLib_Base;
 

src/FEmTool/FEmTool_LinearFlexion.cxx

@@ -24,6 +24,7 @@
 #include <math_Vector.hxx>
 #include <PLib.hxx>
 #include <PLib_HermitJacobi.hxx>
+#include <PLib_JacobiPolynomial.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_DomainError.hxx>
 #include <Standard_NotImplemented.hxx>

src/FEmTool/FEmTool_LinearFlexion.hxx

@@ -25,6 +25,7 @@
 #include <FEmTool_ElementaryCriterion.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <TColStd_HArray2OfInteger.hxx>
+#include <Standard_Real.hxx>
 #include <math_Vector.hxx>
 
 

src/FEmTool/FEmTool_LinearJerk.cxx

@@ -24,6 +24,7 @@
 #include <math_Vector.hxx>
 #include <PLib.hxx>
 #include <PLib_HermitJacobi.hxx>
+#include <PLib_JacobiPolynomial.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_DomainError.hxx>
 #include <Standard_NotImplemented.hxx>

src/FEmTool/FEmTool_LinearJerk.hxx

@@ -25,6 +25,7 @@
 #include <FEmTool_ElementaryCriterion.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <TColStd_HArray2OfInteger.hxx>
+#include <Standard_Real.hxx>
 #include <math_Vector.hxx>
 
 

src/FEmTool/FEmTool_LinearTension.cxx

@@ -24,6 +24,7 @@
 #include <math_Vector.hxx>
 #include <PLib.hxx>
 #include <PLib_HermitJacobi.hxx>
+#include <PLib_JacobiPolynomial.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_DomainError.hxx>
 #include <Standard_NotImplemented.hxx>

src/FEmTool/FEmTool_LinearTension.hxx

@@ -25,6 +25,7 @@
 #include <FEmTool_ElementaryCriterion.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <TColStd_HArray2OfInteger.hxx>
+#include <Standard_Real.hxx>
 #include <math_Vector.hxx>
 
 

src/FEmTool/FEmTool_ProfileMatrix.hxx

@@ -18,10 +18,12 @@
 #define _FEmTool_ProfileMatrix_HeaderFile
 
 #include <Standard.hxx>
+#include <Standard_Type.hxx>
 
 #include <TColStd_Array2OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
+#include <Standard_Boolean.hxx>
 #include <FEmTool_SparseMatrix.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <Standard_Real.hxx>

src/FEmTool/FEmTool_SparseMatrix.cxx

@@ -17,5 +17,6 @@
 
 #include <FEmTool_SparseMatrix.hxx>
 #include <Standard_Type.hxx>
+#include <StdFail_NotDone.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(FEmTool_SparseMatrix,Standard_Transient)

src/FEmTool/FEmTool_SparseMatrix.hxx

@@ -18,10 +18,12 @@
 #define _FEmTool_SparseMatrix_HeaderFile
 
 #include <Standard.hxx>
+#include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
 #include <math_Vector.hxx>
 
 

src/FSD/FSD_BinaryFile.hxx

@@ -23,6 +23,7 @@
 #include <Storage_Error.hxx>
 #include <Storage_OpenMode.hxx>
 #include <Storage_Data.hxx>
+#include <Standard_Boolean.hxx>
 #include <Storage_Position.hxx>
 #include <Standard_Integer.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>

src/FSD/FSD_FStream.hxx

@@ -15,6 +15,7 @@
 #ifndef _FSD_FStream_HeaderFile
 #define _FSD_FStream_HeaderFile
 
+#include <stdio.h>
 #include <Standard_Stream.hxx>
 
 typedef std::fstream FSD_FStream;

src/FairCurve/FairCurve_Batten.cxx

@@ -22,6 +22,7 @@
 
 #include <BSplCLib.hxx>
 #include <FairCurve_Batten.hxx>
+#include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_EnergyOfBatten.hxx>
 #include <FairCurve_Newton.hxx>
 #include <Geom2d_BSplineCurve.hxx>

src/FairCurve/FairCurve_Batten.hxx

@@ -23,6 +23,8 @@
 
 #include <FairCurve_AnalysisCode.hxx>
 #include <gp_Pnt2d.hxx>
+#include <Standard_Real.hxx>
+#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColStd_HArray1OfReal.hxx>

src/FairCurve/FairCurve_DistributionOfJerk.cxx

@@ -23,6 +23,7 @@
 
 
 #include <BSplCLib.hxx>
+#include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_DistributionOfJerk.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_XY.hxx>

src/FairCurve/FairCurve_DistributionOfJerk.hxx

@@ -26,6 +26,7 @@
 #include <Standard_Integer.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
+#include <Standard_Boolean.hxx>
 #include <math_Vector.hxx>
 
 

src/FairCurve/FairCurve_DistributionOfSagging.cxx

@@ -20,6 +20,7 @@
 
 
 #include <BSplCLib.hxx>
+#include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_DistributionOfSagging.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_XY.hxx>

src/FairCurve/FairCurve_DistributionOfSagging.hxx

@@ -26,6 +26,7 @@
 #include <Standard_Integer.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
+#include <Standard_Boolean.hxx>
 #include <math_Vector.hxx>
 
 

src/FairCurve/FairCurve_DistributionOfTension.cxx

@@ -20,6 +20,7 @@
 
 
 #include <BSplCLib.hxx>
+#include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_DistributionOfTension.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_XY.hxx>

src/FairCurve/FairCurve_DistributionOfTension.hxx

@@ -21,11 +21,13 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
+#include <Standard_Real.hxx>
 #include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_DistributionOfEnergy.hxx>
 #include <Standard_Integer.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
+#include <Standard_Boolean.hxx>
 #include <math_Vector.hxx>
 
 

src/FairCurve/FairCurve_Energy.hxx

@@ -23,7 +23,9 @@
 
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
 #include <TColgp_Array1OfXY.hxx>
+#include <math_Vector.hxx>
 #include <math_MultipleVarFunctionWithHessian.hxx>
 #include <Standard_Real.hxx>
 class math_Matrix;

src/FairCurve/FairCurve_EnergyOfBatten.cxx

@@ -20,6 +20,7 @@
 #endif
 
 
+#include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_EnergyOfBatten.hxx>
 #include <math_GaussSetIntegration.hxx>
 #include <math_IntegerVector.hxx>

src/FairCurve/FairCurve_EnergyOfBatten.hxx

@@ -22,6 +22,7 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Real.hxx>
+#include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_DistributionOfTension.hxx>
 #include <FairCurve_DistributionOfSagging.hxx>
 #include <FairCurve_AnalysisCode.hxx>

src/FairCurve/FairCurve_EnergyOfMVC.hxx

@@ -21,6 +21,7 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
+#include <Standard_Real.hxx>
 #include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_DistributionOfTension.hxx>
 #include <FairCurve_DistributionOfSagging.hxx>
@@ -30,6 +31,7 @@
 #include <Standard_Integer.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
+#include <Standard_Boolean.hxx>
 #include <math_Vector.hxx>
 
 // resolve name collisions with X11 headers

src/FairCurve/FairCurve_MinimalVariation.cxx

@@ -21,6 +21,7 @@
 
 
 #include <BSplCLib.hxx>
+#include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_EnergyOfMVC.hxx>
 #include <FairCurve_MinimalVariation.hxx>
 #include <FairCurve_Newton.hxx>
@@ -29,6 +30,9 @@
 #include <gp_Vec2d.hxx>
 #include <math_Matrix.hxx>
 #include <PLib.hxx>
+#include <Precision.hxx>
+#include <Standard_DomainError.hxx>
+#include <Standard_NegativeValue.hxx>
 #include <Standard_NullValue.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColStd_HArray1OfInteger.hxx>

src/FairCurve/FairCurve_MinimalVariation.hxx

@@ -19,9 +19,13 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
 
+#include <Standard_Real.hxx>
 #include <FairCurve_Batten.hxx>
+#include <Standard_Boolean.hxx>
 #include <FairCurve_AnalysisCode.hxx>
+#include <Standard_Integer.hxx>
 #include <Standard_OStream.hxx>
 class gp_Pnt2d;
 class gp_Vec2d;

src/FairCurve/FairCurve_Newton.hxx

@@ -21,7 +21,10 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
+#include <Standard_Real.hxx>
 #include <math_NewtonMinimum.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Boolean.hxx>
 class math_MultipleVarFunctionWithHessian;
 
 

src/FilletSurf/FilletSurf_Builder.cxx

@@ -14,6 +14,7 @@
 
 // Modified:     Portage NT 7-5-97 DPF (return)
 
+#include <ChFi3d_FilletShape.hxx>
 #include <FilletSurf_Builder.hxx>
 #include <FilletSurf_ErrorTypeStatus.hxx>
 #include <FilletSurf_InternalBuilder.hxx>

src/FilletSurf/FilletSurf_InternalBuilder.cxx

@@ -16,6 +16,7 @@
 
 #include <Adaptor3d_TopolTool.hxx>
 #include <BRep_Tool.hxx>
+#include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_ConstRad.hxx>
@@ -30,12 +31,16 @@
 #include <ChFiDS_FilSpine.hxx>
 #include <ChFiDS_HData.hxx>
 #include <ChFiDS_ElSpine.hxx>
+#include <ChFiDS_ListIteratorOfListOfStripe.hxx>
+#include <ChFiDS_ListOfStripe.hxx>
 #include <ChFiDS_SecHArray1.hxx>
 #include <ChFiDS_SequenceOfSurfData.hxx>
 #include <ChFiDS_Spine.hxx>
 #include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ElSLib.hxx>
+#include <FilletSurf_ErrorTypeStatus.hxx>
+#include <FilletSurf_StatusDone.hxx>
 #include <FilletSurf_StatusType.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom_Circle.hxx>
@@ -44,19 +49,22 @@
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAbs_Shape.hxx>
+#include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Pln.hxx>
 #include <IntCurveSurface_HInter.hxx>
 #include <IntCurveSurface_IntersectionPoint.hxx>
+#include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 static Standard_Boolean isinlist(const TopoDS_Shape&         E,
-                                 const TopTools_ListOfShape& L){
+				 const TopTools_ListOfShape& L){
   TopTools_ListIteratorOfListOfShape It;
   for (It.Initialize(L); It.More(); It.Next()){
     if(E.IsSame(It.Value())) return 1;

src/FilletSurf/FilletSurf_InternalBuilder.hxx

@@ -18,6 +18,8 @@
 #define _FilletSurf_InternalBuilder_HeaderFile
 
 #include <BRepAdaptor_Curve2d.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <ChFiDS_ElSpine.hxx>
 #include <ChFi3d_FilBuilder.hxx>
 #include <ChFi3d_FilletShape.hxx>
 #include <TopTools_ListOfShape.hxx>

src/Font/Font_FontMgr.cxx

@@ -21,6 +21,7 @@
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <NCollection_Buffer.hxx>
+#include <NCollection_List.hxx>
 #include <NCollection_Map.hxx>
 #include <OSD_Environment.hxx>
 #include <Standard_Stream.hxx>

src/Font/Font_FontMgr.hxx

@@ -18,6 +18,8 @@
 
 #include <Standard.hxx>
 #include <Standard_Transient.hxx>
+#include <Standard_Type.hxx>
+#include <Font_FontAspect.hxx>
 #include <Font_NListOfSystemFont.hxx>
 #include <Font_StrictLevel.hxx>
 #include <Font_UnicodeSubset.hxx>

src/Font/Font_SystemFont.hxx

@@ -18,6 +18,7 @@
 
 #include <Font_FontAspect.hxx>
 #include <Standard.hxx>
+#include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>
 #include <TCollection_AsciiString.hxx>
 

src/GC/GC_MakeConicalSurface.cxx

@@ -19,6 +19,7 @@
 #include <gce_MakeCone.hxx>
 #include <Geom_ConicalSurface.hxx>
 #include <gp.hxx>
+#include <gp_Ax1.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Cone.hxx>
 #include <gp_Lin.hxx>

src/GC/GC_MakeMirror.cxx

@@ -17,7 +17,11 @@
 
 #include <GC_MakeMirror.hxx>
 #include <Geom_Transformation.hxx>
+#include <gp_Ax1.hxx>
+#include <gp_Ax2.hxx>
+#include <gp_Ax3.hxx>
 #include <gp_Dir.hxx>
+#include <gp_Lin.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <StdFail_NotDone.hxx>

src/GC/GC_MakePlane.cxx

@@ -20,6 +20,8 @@
 #include <Geom_Plane.hxx>
 #include <gp.hxx>
 #include <gp_Ax1.hxx>
+#include <gp_Ax2.hxx>
+#include <gp_Ax3.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>

src/GC/GC_MakeRotation.cxx

@@ -17,6 +17,7 @@
 
 #include <GC_MakeRotation.hxx>
 #include <Geom_Transformation.hxx>
+#include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>

src/GC/GC_MakeTrimmedCylinder.cxx

@@ -21,6 +21,7 @@
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Circ.hxx>
+#include <gp_Cylinder.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <StdFail_NotDone.hxx>

src/GC/GC_Root.hxx

@@ -19,8 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
 
 #include <gce_ErrorType.hxx>
+#include <Standard_Boolean.hxx>
 
 // resolve name collisions with X11 headers
 #ifdef Status

src/GCE2d/GCE2d_Root.hxx

@@ -19,8 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
 
 #include <gce_ErrorType.hxx>
+#include <Standard_Boolean.hxx>
 
 // resolve name collisions with X11 headers
 #ifdef Status

src/GCPnts/GCPnts_DistFunction.hxx

@@ -14,6 +14,7 @@
 #ifndef _GCPnts_DistFunction_HeaderFile
 #define _GCPnts_DistFunction_HeaderFile
 
+#include <gp_Lin.hxx>
 #include <math_Function.hxx>
 #include <math_MultipleVarFunction.hxx>
 #include <Adaptor3d_Curve.hxx>

src/GCPnts/GCPnts_DistFunction2d.hxx

@@ -14,6 +14,7 @@
 #ifndef _GCPnts_DistFunction2d_HeaderFile
 #define _GCPnts_DistFunction2d_HeaderFile
 
+#include <gp_Lin2d.hxx>
 #include <math_Function.hxx>
 #include <math_MultipleVarFunction.hxx>
 #include <Adaptor2d_Curve2d.hxx>

src/GCPnts/GCPnts_QuasiUniformAbscissa.cxx

@@ -16,9 +16,11 @@
 
 #include <GCPnts_TCurveTypes.hxx>
 #include <GCPnts_UniformAbscissa.hxx>
+#include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
+#include <TColgp_Array1OfPnt.hxx>
 
 //=======================================================================
 //function : GCPnts_QuasiUniformAbscissa

src/GCPnts/GCPnts_TangentialDeflection.cxx

@@ -23,10 +23,13 @@
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
 #include <gp_XYZ.hxx>
+#include <gp_Circ.hxx>
+#include <gp_Circ2d.hxx>
 #include <math_BrentMinimum.hxx>
 #include <math_PSO.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
+#include <Standard_OutOfRange.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 namespace

src/GCPnts/GCPnts_TangentialDeflection.hxx

@@ -20,6 +20,7 @@
 #include <TColgp_SequenceOfPnt.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <gp_Pnt.hxx>
+#include <gp_Lin.hxx>
 #include <math_Function.hxx>
 #include <math_MultipleVarFunction.hxx>
 #include <Adaptor3d_Curve.hxx>

src/GCPnts/GCPnts_UniformDeflection.cxx

@@ -19,7 +19,10 @@
 #include <GCPnts_TCurveTypes.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
+#include <Standard_ConstructionError.hxx>
+#include <Standard_DomainError.hxx>
 #include <Standard_NotImplemented.hxx>
+#include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
 
 // mask the return of a Adaptor2d_Curve2d as a gp_Pnt 

src/GccAna/GccAna_Circ2d2TanOn.cxx

@@ -18,6 +18,8 @@
 #include <GccAna_Circ2dBisec.hxx>
 #include <GccEnt_BadQualifier.hxx>
 #include <GccEnt_QualifiedCirc.hxx>
+#include <GccEnt_QualifiedLin.hxx>
+#include <GccInt_BCirc.hxx>
 #include <GccInt_BLine.hxx>
 #include <GccInt_IType.hxx>
 #include <gp_Ax2d.hxx>

src/GccAna/GccAna_Circ2d2TanOn.hxx

@@ -19,13 +19,16 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
 
+#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TColgp_Array1OfCirc2d.hxx>
 #include <GccEnt_Array1OfPosition.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
+#include <Standard_Real.hxx>
 #include <GccEnt_Position.hxx>
 class GccEnt_QualifiedCirc;
 class gp_Lin2d;

src/GccAna/GccAna_Circ2d2TanOn_1.cxx

@@ -31,6 +31,8 @@
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_Conic.hxx>
 #include <IntAna2d_IntPoint.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 
 //=========================================================================
 //   Creation of a circle tangent to Circle C1 and a straight line L2.    +

src/GccAna/GccAna_Circ2d2TanOn_10.cxx

@@ -19,7 +19,9 @@
 #include <GccAna_Circ2d2TanOn.hxx>
 #include <GccAna_LinPnt2dBisec.hxx>
 #include <GccEnt_BadQualifier.hxx>
+#include <GccEnt_QualifiedCirc.hxx>
 #include <GccEnt_QualifiedLin.hxx>
+#include <GccInt_Bisec.hxx>
 #include <GccInt_BLine.hxx>
 #include <GccInt_IType.hxx>
 #include <gp_Ax2d.hxx>
@@ -30,6 +32,8 @@
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_Conic.hxx>
 #include <IntAna2d_IntPoint.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 
 //=========================================================================
 //   Creation of a circle tangent to straight line L1 and a point Point2.   +

src/GccAna/GccAna_Circ2d2TanOn_11.cxx

@@ -24,7 +24,10 @@
 
 #include <ElCLib.hxx>
 #include <GccAna_Circ2d2TanOn.hxx>
+#include <GccAna_Lin2dBisec.hxx>
 #include <GccEnt_BadQualifier.hxx>
+#include <GccEnt_QualifiedCirc.hxx>
+#include <GccEnt_QualifiedLin.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Dir2d.hxx>
@@ -32,6 +35,8 @@
 #include <gp_Pnt2d.hxx>
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_IntPoint.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 
 //=========================================================================
 //   Creation of a circle passing by  : 2 points Point1 and Point2.        +

src/GccAna/GccAna_Circ2d2TanOn_2.cxx

@@ -19,7 +19,9 @@
 #include <GccAna_Circ2d2TanOn.hxx>
 #include <GccAna_Lin2dBisec.hxx>
 #include <GccEnt_BadQualifier.hxx>
+#include <GccEnt_QualifiedCirc.hxx>
 #include <GccEnt_QualifiedLin.hxx>
+#include <gp.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Dir2d.hxx>
@@ -27,6 +29,8 @@
 #include <gp_Pnt2d.hxx>
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_IntPoint.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 
 GccAna_Circ2d2TanOn::
    GccAna_Circ2d2TanOn (const GccEnt_QualifiedLin&  Qualified1 , 

src/GccAna/GccAna_Circ2d2TanOn_3.cxx

@@ -20,7 +20,10 @@
 #include <GccAna_CircPnt2dBisec.hxx>
 #include <GccEnt_BadQualifier.hxx>
 #include <GccEnt_QualifiedCirc.hxx>
+#include <GccEnt_QualifiedLin.hxx>
+#include <GccInt_BCirc.hxx>
 #include <GccInt_Bisec.hxx>
+#include <GccInt_BLine.hxx>
 #include <GccInt_IType.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Circ2d.hxx>
@@ -30,6 +33,8 @@
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_Conic.hxx>
 #include <IntAna2d_IntPoint.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 //=========================================================================

src/GccAna/GccAna_Circ2d2TanOn_4.cxx

@@ -19,8 +19,11 @@
 #include <GccAna_Circ2d2TanOn.hxx>
 #include <GccAna_LinPnt2dBisec.hxx>
 #include <GccEnt_BadQualifier.hxx>
+#include <GccEnt_QualifiedCirc.hxx>
 #include <GccEnt_QualifiedLin.hxx>
+#include <GccInt_BCirc.hxx>
 #include <GccInt_Bisec.hxx>
+#include <GccInt_BLine.hxx>
 #include <GccInt_IType.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Circ2d.hxx>
@@ -31,6 +34,8 @@
 #include <IntAna2d_Conic.hxx>
 #include <IntAna2d_IntPoint.hxx>
 #include <Precision.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 
 //=========================================================================
 //   Creation of a circle Tangent to : 1 straight line L1.                +

src/GccAna/GccAna_Circ2d2TanOn_5.cxx

@@ -18,6 +18,8 @@
 #include <ElCLib.hxx>
 #include <GccAna_Circ2d2TanOn.hxx>
 #include <GccEnt_BadQualifier.hxx>
+#include <GccEnt_QualifiedCirc.hxx>
+#include <GccEnt_QualifiedLin.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Dir2d.hxx>
@@ -25,6 +27,8 @@
 #include <gp_Pnt2d.hxx>
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_IntPoint.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 
 //=========================================================================
 //   Creation of a circle passing by : 2 points Point1 and Point2.        +

src/GccAna/GccAna_Circ2d2TanOn_6.cxx

@@ -20,15 +20,20 @@
 #include <GccAna_Circ2dBisec.hxx>
 #include <GccEnt_BadQualifier.hxx>
 #include <GccEnt_QualifiedCirc.hxx>
+#include <GccEnt_QualifiedLin.hxx>
+#include <GccInt_BCirc.hxx>
 #include <GccInt_BLine.hxx>
 #include <GccInt_IType.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Dir2d.hxx>
+#include <gp_Lin2d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_Conic.hxx>
 #include <IntAna2d_IntPoint.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 //=========================================================================

src/GccAna/GccAna_Circ2d2TanOn_7.cxx

@@ -31,6 +31,8 @@
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_Conic.hxx>
 #include <IntAna2d_IntPoint.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 GccAna_Circ2d2TanOn::

src/GccAna/GccAna_Circ2d2TanOn_8.cxx

@@ -27,16 +27,23 @@
 #include <GccAna_CircPnt2dBisec.hxx>
 #include <GccEnt_BadQualifier.hxx>
 #include <GccEnt_QualifiedCirc.hxx>
+#include <GccEnt_QualifiedLin.hxx>
+#include <GccInt_BCirc.hxx>
 #include <GccInt_Bisec.hxx>
+#include <GccInt_BLine.hxx>
 #include <GccInt_IType.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Dir2d.hxx>
+#include <gp_Lin2d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_Conic.hxx>
 #include <IntAna2d_IntPoint.hxx>
 #include <Precision.hxx>
+#include <Standard_ConstructionError.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 GccAna_Circ2d2TanOn::

src/GccAna/GccAna_Circ2d2TanOn_9.cxx

@@ -19,6 +19,7 @@
 #include <GccAna_Circ2d2TanOn.hxx>
 #include <GccAna_Lin2dBisec.hxx>
 #include <GccEnt_BadQualifier.hxx>
+#include <GccEnt_QualifiedCirc.hxx>
 #include <GccEnt_QualifiedLin.hxx>
 #include <gp.hxx>
 #include <gp_Ax2d.hxx>
@@ -28,6 +29,8 @@
 #include <gp_Pnt2d.hxx>
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_IntPoint.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 
 GccAna_Circ2d2TanOn::
    GccAna_Circ2d2TanOn (const GccEnt_QualifiedLin&  Qualified1 ,

src/GccAna/GccAna_Circ2d2TanRad.cxx

@@ -17,8 +17,10 @@
 #include <GccAna_Circ2d2TanRad.hxx>
 #include <GccEnt_BadQualifier.hxx>
 #include <GccEnt_QualifiedCirc.hxx>
+#include <GccEnt_QualifiedLin.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Circ2d.hxx>
+#include <gp_Lin2d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_IntPoint.hxx>

src/GccAna/GccAna_Circ2d2TanRad.hxx

@@ -19,13 +19,16 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
 
+#include <Standard_Boolean.hxx>
 #include <GccEnt_Array1OfPosition.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <Standard_Integer.hxx>
 #include <TColgp_Array1OfCirc2d.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
+#include <Standard_Real.hxx>
 #include <GccEnt_Position.hxx>
 class GccEnt_QualifiedCirc;
 class GccEnt_QualifiedLin;

src/GccAna/GccAna_Circ2d2TanRad_1.cxx

@@ -27,6 +27,8 @@
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_IntPoint.hxx>
 #include <Standard_NegativeValue.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 // circular tangent to a circle, a line and a given radius

src/GccAna/GccAna_Circ2d2TanRad_2.cxx

@@ -19,6 +19,7 @@
 #include <GccAna_Circ2d2TanRad.hxx>
 #include <GccEnt_BadQualifier.hxx>
 #include <GccEnt_QualifiedCirc.hxx>
+#include <GccEnt_QualifiedLin.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Lin2d.hxx>
@@ -26,6 +27,8 @@
 #include <IntAna2d_AnaIntersection.hxx>
 #include <IntAna2d_IntPoint.hxx>
 #include <Standard_NegativeValue.hxx>
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 
 // circulare tangent to a circle a point and a given radius
 //=============================================================