OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0022651: Impossible to build OCC as static library due to using Standard_EXPORT instead of Standard_API

Browse Source 
All library-specific macros for defining export / import properties of symbols on Windows (like Standard_API, __Draw_API, _math_API etc.) are eliminated.
Common macro Standard_EXPORT is used in all places where it is necessary.

New macro OCCT_STATIC_BUILD is defined for disabling Standard_EXPORT, to be used instead of HAVE_NO_DLL, though the latter is still supported as well (for compatibility).

To allow building OCCT in static mode on Windows after these changes:
- Files OSD_WNT_1.hxx and OSD_WNT_BREAK.hxx are removed; useful declarations are moved to OSD_WNT.hxx
- In the class IVtkVTK_ShapeData, static fields ARRNAME_MESH_TYPES and ARRNAME_SUBSHAPE_IDS are converted to static inline functions
- Global array ChoixRef defined in IntImp_ComputeTangence.cxx is converted to static function returning element of the array by index
- Unused class Quantity_Convert is removed (it had static field accessed by inline method)
- Struct Approx_Data defined in the same way in BRepApprox_Approx.hxx and GeomInt_WLApprox.hxx is made private member of these classes to avoid name clash
- Some C++ files producing no object code are removed
- In NCollection_EBTree.hxx and StdLPersistent_Collectio.hxx, definition of template virtual method is moved to class definition to avoid MSVC linker warnings on unused symbols
This commit is contained in:
abv 2018-03-15 13:07:48 +03:00
parent 8662560e2c
commit 68df847802
86 changed files with 465 additions and 1367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adm/cmake/occt_toolkit.cmake
View File

@ -12,7 +12,7 @@ set (PRECOMPILED_DEFS)
if (NOT BUILD_SHARED_LIBS)
list (APPEND PRECOMPILED_DEFS "-DOCCT_NO_PLUGINS")
if (WIN32)
list (APPEND PRECOMPILED_DEFS "-DHAVE_NO_DLL")
list (APPEND PRECOMPILED_DEFS "-DOCCT_STATIC_BUILD")
endif()
endif()
@ -24,9 +24,9 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
# do nothing
else()
if (WIN32)
list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
endif()
# if (WIN32)
# list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
# endif()
set (SOURCE_FILES)
set (HEADER_FILES)

8
adm/cmake/occt_toolkit_tool.cmake
View File

@ -33,7 +33,7 @@ set (PRECOMPILED_DEFS)
if (NOT BUILD_SHARED_LIBS)
list (APPEND PRECOMPILED_DEFS "-DOCCT_NO_PLUGINS")
if (WIN32)
list (APPEND PRECOMPILED_DEFS "-DHAVE_NO_DLL")
list (APPEND PRECOMPILED_DEFS "-DOCCT_STATIC_BUILD")
endif()
endif()
@ -47,9 +47,9 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
# do nothing
else()
if (WIN32)
list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
endif()
# if (WIN32)
# list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
# endif()
set (SOURCE_FILES)
set (HEADER_FILES)

22
adm/genproj.tcl
View File

@ -1727,7 +1727,7 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
regsub -all -- {__TKDEP__} $theProjTmpl $aUsedLibs theProjTmpl
set anIncPaths "..\\..\\..\\inc"
set aTKDefines ""
# set aTKDefines ""
set aFilesSection ""
set aVcFilesX(units) ""
set listloc [osutils:tk:units $theToolKit]
@ -1794,13 +1794,13 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
}
# macros
append aTKDefines ";__${xlo}_DLL"
# append aTKDefines ";__${xlo}_DLL"
# common includes
# append anIncPaths ";..\\..\\..\\src\\${xlo}"
}
regsub -all -- {__TKINC__} $theProjTmpl $anIncPaths theProjTmpl
regsub -all -- {__TKDEFS__} $theProjTmpl $aTKDefines theProjTmpl
# regsub -all -- {__TKDEFS__} $theProjTmpl $aTKDefines theProjTmpl
regsub -all -- {__FILES__} $theProjTmpl $aFilesSection theProjTmpl
# write file
@ -1947,10 +1947,10 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
puts "Warning : in vcproj there are than one occurences for [file tail $f]"
}
#puts "$aProjTmpl $aFilesSection"
set aTKDefines ";__${theToolKit}_DLL"
# set aTKDefines ";__${theToolKit}_DLL"
set anIncPaths "..\\..\\..\\inc"
regsub -all -- {__TKINC__} $aProjTmpl $anIncPaths aProjTmpl
regsub -all -- {__TKDEFS__} $aProjTmpl $aTKDefines aProjTmpl
# regsub -all -- {__TKDEFS__} $aProjTmpl $aTKDefines aProjTmpl
regsub -all -- {__FILES__} $aProjTmpl $aFilesSection aProjTmpl
regsub -all -- {__CONF__} $aProjTmpl Application aProjTmpl
@ -2162,9 +2162,9 @@ proc osutils:cbptk { theCmpl theOutDir theToolKit thePlatform} {
}
# macros for correct DLL exports
if { $thePlatform == "wnt" || $thePlatform == "uwp" } {
lappend aTKDefines "__${xlo}_DLL"
}
# if { $thePlatform == "wnt" || $thePlatform == "uwp" } {
# lappend aTKDefines "__${xlo}_DLL"
# }
}
return [osutils:cbp $theCmpl $theOutDir $theToolKit $thePlatform $aTKSrcFiles $aUsedLibs $aFrameworks $anIncPaths $aTKDefines]
@ -2281,9 +2281,9 @@ proc osutils:cbpx { theCmpl theOutDir theToolKit thePlatform } {
}
# macros for correct DLL exports
if { $thePlatform == "wnt" || $thePlatform == "uwp" } {
lappend aTKDefines "__${theToolKit}_DLL"
}
# if { $thePlatform == "wnt" || $thePlatform == "uwp" } {
# lappend aTKDefines "__${theToolKit}_DLL"
# }
# common include paths
lappend anIncPaths "../../../inc"

16
adm/templates/template.vc10
View File

@ -90,7 +90,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -107,7 +107,7 @@
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -138,7 +138,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@ -156,7 +156,7 @@
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -186,7 +186,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -203,7 +203,7 @@
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -234,7 +234,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@ -252,7 +252,7 @@
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

16
adm/templates/template.vc10x
View File

@ -85,7 +85,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -100,7 +100,7 @@
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
@ -130,7 +130,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@ -146,7 +146,7 @@
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
@ -175,7 +175,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -190,7 +190,7 @@
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
@ -219,7 +219,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@ -235,7 +235,7 @@
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>

8
adm/templates/template.vc7
View File

@ -22,7 +22,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@ -62,7 +62,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
Culture="1036"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
@ -89,7 +89,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
@ -131,7 +131,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
Culture="1036"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>

8
adm/templates/template.vc7x
View File

@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
@ -61,7 +61,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
@ -86,7 +86,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@ -124,7 +124,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>

16
adm/templates/template.vc8
View File

@ -50,7 +50,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
@ -70,7 +70,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
Culture="1036"
/>
<Tool
@ -148,7 +148,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -170,7 +170,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
Culture="1036"
/>
<Tool
@ -249,7 +249,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
@ -268,7 +268,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
Culture="1036"
/>
<Tool
@ -347,7 +347,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -368,7 +368,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
Culture="1036"
/>
<Tool

16
adm/templates/template.vc8x
View File

@ -49,7 +49,7 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -68,7 +68,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__;"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES);"
Culture="1033"
/>
<Tool
@ -145,7 +145,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
@ -164,7 +164,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES);"
Culture="1033"
/>
<Tool
@ -240,7 +240,7 @@
AdditionalOptions="/favor:blend"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -258,7 +258,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
Culture="1033"
/>
<Tool
@ -337,7 +337,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
@ -355,7 +355,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
Culture="1033"
/>
<Tool

16
adm/templates/template.vc9
View File

@ -53,7 +53,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
@ -73,7 +73,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
/>
<Tool
Name="VCPreLinkEventTool"
@ -150,7 +150,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -172,7 +172,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
/>
<Tool
Name="VCPreLinkEventTool"
@ -248,7 +248,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
@ -267,7 +267,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
/>
<Tool
Name="VCPreLinkEventTool"
@ -342,7 +342,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
InlineFunctionExpansion="1"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -363,7 +363,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
/>
<Tool
Name="VCPreLinkEventTool"

16
adm/templates/template.vc9x
View File

@ -52,7 +52,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
@ -71,7 +71,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
/>
<Tool
Name="VCPreLinkEventTool"
@ -143,7 +143,7 @@
AdditionalOptions="-MP"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -162,7 +162,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
/>
<Tool
Name="VCPreLinkEventTool"
@ -236,7 +236,7 @@
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
@ -254,7 +254,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
/>
<Tool
Name="VCPreLinkEventTool"
@ -327,7 +327,7 @@
AdditionalOptions="-MP -favor:blend"
AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
Optimization="0"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -345,7 +345,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
/>
<Tool
Name="VCPreLinkEventTool"

2
dox/dev_guides/building/cmake/cmake.md
View File

@ -93,7 +93,7 @@ The following table gives the full list of environment variables used at the con
| 3RDPARTY_TBB* | Path | Path to TBB binaries |
| 3RDPARTY_VTK_* | Path | Path to VTK binaries |
| BUILD_MODULE_<MODULE>| Boolean flag | Indicates whether the corresponding OCCT module should be built or not. It should be noted that some toolkits of a module can be built even if this module is not checked (this happens if some other modules depend on these toolkits). The main modules and their descriptions can be found in @ref user_guides |
| BUILD_LIBRARY_TYPE | String | Specifies the type of library to be created. "Shared" libraries are linked dynamically and loaded at runtime. "Static" libraries are archives of object files used when linking other targets. Note that Draw Harness plugin system is incompatible with "Static" builds, and therefore it should be excluded. Using "Static" libraries also might require modification in building procedures of user application (and OCCT samples); on Windows platform, user application should define HAVE_NO_DLL. |
| BUILD_LIBRARY_TYPE | String | Specifies the type of library to be created. "Shared" libraries are linked dynamically and loaded at runtime. "Static" libraries are archives of object files used when linking other targets. Note that Draw Harness plugin system is incompatible with "Static" builds, and therefore it is disabled for these builds.|
| BUILD_ADDITIONAL_TOOLKITS | String | Semicolon-separated individual toolkits to include into build process. If you want to build some particular libraries (toolkits) only, then you may uncheck all modules in the corresponding *BUILD_MODUE_\<MODULE\>* options and provide the list of necessary libraries here. Of course, all dependencies will be resolved automatically |
| BUILD_YACCLEX | Boolean flag | Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and ExprIntrp functionality are generated automatically with Flex/Bison. Checking this option leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files |
| BUILD_MODULE_MfcSamples | Boolean flag | Indicates whether MFC samples should be built together with OCCT. This option is only relevant to Windows platforms |

5
src/AppBlend/AppBlend_AppSurf.gxx
View File

@ -36,8 +36,9 @@
#include <AppDef_Variational.hxx>
static Standard_Boolean scal = 1;
extern Standard_Boolean AppBlend_GetContextSplineApprox();
extern Standard_Boolean AppBlend_GetContextApproxWithNoTgt();
Standard_EXPORT Standard_Boolean AppBlend_GetContextSplineApprox();
Standard_EXPORT Standard_Boolean AppBlend_GetContextApproxWithNoTgt();
// modified by EAP (Edward AGAPOV) Fri Jan 4 2002, bug OCC9
// --- keep pipe parametrized like path

20
src/AppBlend/AppBlend_Debug.cxx
View File

@ -16,30 +16,18 @@
#include <Standard_Boolean.hxx>
#ifndef __AppBlend_API
# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __AppBlend_DLL
# define __AppBlend_API __declspec( dllexport )
# else
# define __AppBlend_API __declspec( dllimport )
# endif /*__AppBlend_DLL*/
# else
# define __AppBlend_API
# endif /*_WIN32*/
#endif /*__AppBlend_API*/
//****************************************************
// Functions to change the type of approx.
//****************************************************
static Standard_Boolean AppBlend_ContextSplineApprox = Standard_False;
__AppBlend_API extern void AppBlend_SetContextSplineApprox(const Standard_Boolean b)
Standard_EXPORT void AppBlend_SetContextSplineApprox(const Standard_Boolean b)
{ AppBlend_ContextSplineApprox = b; }
__AppBlend_API extern Standard_Boolean AppBlend_GetContextSplineApprox()
Standard_EXPORT Standard_Boolean AppBlend_GetContextSplineApprox()
{ return AppBlend_ContextSplineApprox; }
static Standard_Boolean AppBlend_ContextApproxWithNoTgt = Standard_False;
__AppBlend_API extern void AppBlend_SetContextApproxWithNoTgt(const Standard_Boolean b)
Standard_EXPORT void AppBlend_SetContextApproxWithNoTgt(const Standard_Boolean b)
{ AppBlend_ContextApproxWithNoTgt = b; }
__AppBlend_API extern Standard_Boolean AppBlend_GetContextApproxWithNoTgt()
Standard_EXPORT Standard_Boolean AppBlend_GetContextApproxWithNoTgt()
{ return AppBlend_ContextApproxWithNoTgt; }

30
src/AppCont/AppCont_ContMatrices.hxx
View File

@ -17,42 +17,22 @@
#include <math_Vector.hxx>
#include <Standard_Real.hxx>
//#ifndef __AppCont_API
//#if defined(_WIN32) && !defined(HAVE_NO_DLL)
//# ifdef __AppCont_DLL
//# define __AppCont_API __declspec( dllexport )
//# else
//# define __AppCont_API __declspec( dllimport )
//# endif /* __AppCont_DLL */
//# else
//# define __AppCont_API
//# endif /* _WIN32 */
//#endif /* __AppCont_API */
// Stockage des matrices de resolution d approxiamtion continue.
// La classe est limitee a 26 pour MMatrix et InvMMatrix, (pas de contraintes)
// pour IBPMatrix (contraintes de passage aux extremites)
// et IBTMatrix (contraintes de tangence aux extremites).
//__AppCont_API void InvMMatrix(const Standard_Integer classe, math_Matrix& M);
Standard_EXPORT void InvMMatrix(const Standard_Integer classe, math_Matrix& M);
void InvMMatrix(const Standard_Integer classe, math_Matrix& M);
//__AppCont_API void MMatrix(const Standard_Integer classe, math_Matrix& M);
Standard_EXPORT void MMatrix(const Standard_Integer classe, math_Matrix& M);
void MMatrix(const Standard_Integer classe, math_Matrix& M);
//__AppCont_API void IBPMatrix(const Standard_Integer classe, math_Matrix& M);
Standard_EXPORT void IBPMatrix(const Standard_Integer classe, math_Matrix& M);
void IBPMatrix(const Standard_Integer classe, math_Matrix& M);
//__AppCont_API void IBTMatrix(const Standard_Integer classe, math_Matrix& M);
Standard_EXPORT void IBTMatrix(const Standard_Integer classe, math_Matrix& M);
void IBTMatrix(const Standard_Integer classe, math_Matrix& M);
//__AppCont_API void VBernstein(const Standard_Integer classe,
Standard_EXPORT void VBernstein(const Standard_Integer classe,
void VBernstein(const Standard_Integer classe,
const Standard_Integer nbpoints,
math_Matrix& M);
#endif

33
src/AppCont/AppCont_Function.hxx
View File

@ -28,56 +28,55 @@ class AppCont_Function
{
public:
Standard_EXPORT AppCont_Function()
AppCont_Function()
{
myNbPnt = -1;
myNbPnt2d = -1;
}
//! Get number of 3d and 2d points returned by "Value" and "D1" functions.
Standard_EXPORT void GetNumberOfPoints(Standard_Integer& theNbPnt,
Standard_Integer& theNbPnt2d) const
void GetNumberOfPoints(Standard_Integer& theNbPnt, Standard_Integer& theNbPnt2d) const
{
theNbPnt = myNbPnt;
theNbPnt2d = myNbPnt2d;
}
//! Get number of 3d points returned by "Value" and "D1" functions.
Standard_EXPORT Standard_Integer GetNbOf3dPoints() const
Standard_Integer GetNbOf3dPoints() const
{
return myNbPnt;
}
//! Get number of 2d points returned by "Value" and "D1" functions.
Standard_EXPORT Standard_Integer GetNbOf2dPoints() const
Standard_Integer GetNbOf2dPoints() const
{
return myNbPnt2d;
}
//! Destructor
Standard_EXPORT virtual ~AppCont_Function() {}
virtual ~AppCont_Function() {}
//! Returns the first parameter of the function.
Standard_EXPORT virtual Standard_Real FirstParameter() const = 0;
virtual Standard_Real FirstParameter() const = 0;
//! Returns the last parameter of the function.
Standard_EXPORT virtual Standard_Real LastParameter() const = 0;
virtual Standard_Real LastParameter() const = 0;
//! Returns the point at parameter <theU>.
Standard_EXPORT virtual Standard_Boolean Value(const Standard_Real theU,
NCollection_Array1<gp_Pnt2d>& thePnt2d,
NCollection_Array1<gp_Pnt>& thePnt) const = 0;
virtual Standard_Boolean Value (const Standard_Real theU,
NCollection_Array1<gp_Pnt2d>& thePnt2d,
NCollection_Array1<gp_Pnt>& thePnt) const = 0;
//! Returns the derivative at parameter <theU>.
Standard_EXPORT virtual Standard_Boolean D1(const Standard_Real theU,
NCollection_Array1<gp_Vec2d>& theVec2d,
NCollection_Array1<gp_Vec>& theVec) const = 0;
virtual Standard_Boolean D1 (const Standard_Real theU,
NCollection_Array1<gp_Vec2d>& theVec2d,
NCollection_Array1<gp_Vec>& theVec) const = 0;
//! Return information about peridicity in output paramateters space.
//! @param theDimIdx Defines index in output parameters space. 1 <= theDimIdx <= 3 * myNbPnt + 2 * myNbPnt2d.
Standard_EXPORT virtual void PeriodInformation(const Standard_Integer /*theDimIdx*/,
Standard_Boolean& IsPeriodic,
Standard_Real& thePeriod) const
virtual void PeriodInformation (const Standard_Integer /*theDimIdx*/,
Standard_Boolean& IsPeriodic,
Standard_Real& thePeriod) const
{
IsPeriodic = Standard_False;
thePeriod = 0.0;

22
src/ApproxInt/ApproxInt_MultiLineTool.gxx
View File

@ -1,22 +0,0 @@
// Created on: 1993-03-30
// Created by: Laurent BUCHARD
// Copyright (c) 1993-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//-- Standard_Integer Approx_NbP3d = 1;
//-- Standard_Integer Approx_NbP2d = 2;

1
src/ApproxInt/FILES
View File

@ -1,7 +1,6 @@
ApproxInt_Approx.gxx
ApproxInt_ImpPrmSvSurfaces.gxx
ApproxInt_MultiLine.gxx
ApproxInt_MultiLineTool.gxx
ApproxInt_KnotTools.hxx
ApproxInt_KnotTools.cxx
ApproxInt_MultiLineTool.lxx

18
src/BOPTools/BOPTools_EdgeSet.cxx
View File

@ -1,18 +0,0 @@
// Created by: Peter KURNEV
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <BOPTools_EdgeSet.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Shape.hxx>

1
src/BOPTools/FILES
View File

@ -12,7 +12,6 @@ BOPTools_BoxBndTree.hxx
BOPTools_ConnexityBlock.hxx
BOPTools_CoupleOfShape.hxx
BOPTools_DataMapOfShapeSet.hxx
BOPTools_EdgeSet.cxx
BOPTools_EdgeSet.hxx
BOPTools_EdgeSet.lxx
BOPTools_IndexedDataMapOfSetShape.hxx

42
src/BRepApprox/BRepApprox_Approx.hxx
View File

@ -49,28 +49,30 @@ class BRepApprox_TheComputeLineBezierOfApprox;
class BRepApprox_MyGradientOfTheComputeLineBezierOfApprox;
class AppParCurves_MultiBSpCurve;
struct Approx_Data
{
Approx_Data() : myBezierApprox(Standard_True),
Xo(0.0), Yo(0.0), Zo(0.0),
U1o(0.0), V1o(0.0), U2o(0.0), V2o(0.0),
ApproxXYZ(Standard_True),
ApproxU1V1(Standard_True),
ApproxU2V2(Standard_True),
indicemin(0), indicemax(0),
myNbPntMax(30), parametrization(Approx_ChordLength)
{
}
Standard_Boolean myBezierApprox;
Standard_Real Xo, Yo, Zo, U1o, V1o, U2o, V2o;
Standard_Boolean ApproxXYZ, ApproxU1V1, ApproxU2V2;
Standard_Integer indicemin, indicemax, myNbPntMax;
Approx_ParametrizationType parametrization;
};
class BRepApprox_Approx
{
private:
struct Approx_Data
{
Approx_Data () : myBezierApprox (Standard_True),
Xo (0.0), Yo (0.0), Zo (0.0),
U1o (0.0), V1o (0.0), U2o (0.0), V2o (0.0),
ApproxXYZ (Standard_True),
ApproxU1V1 (Standard_True),
ApproxU2V2 (Standard_True),
indicemin (0), indicemax (0),
myNbPntMax (30), parametrization (Approx_ChordLength)
{
}
Standard_Boolean myBezierApprox;
Standard_Real Xo, Yo, Zo, U1o, V1o, U2o, V2o;
Standard_Boolean ApproxXYZ, ApproxU1V1, ApproxU2V2;
Standard_Integer indicemin, indicemax, myNbPntMax;
Approx_ParametrizationType parametrization;
};
public:
DEFINE_STANDARD_ALLOC

30
src/BRepApprox/BRepApprox_TheMultiLineToolOfApprox_0.cxx
View File

@ -1,30 +0,0 @@
// Created on: 1995-06-06
// Created by: Jean Yves LEBEY
// Copyright (c) 1995-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <BRepApprox_TheMultiLineToolOfApprox.hxx>
#include <BRepApprox_TheMultiLineOfApprox.hxx>
#include <ApproxInt_SvSurfaces.hxx>
#define TheMultiLine BRepApprox_TheMultiLineOfApprox
#define TheMultiLine_hxx <BRepApprox_TheMultiLineOfApprox.hxx>
#define TheMultiMPoint ApproxInt_SvSurfaces
#define TheMultiMPoint_hxx <ApproxInt_SvSurfaces.hxx>
#define ApproxInt_MultiLineTool BRepApprox_TheMultiLineToolOfApprox
#define ApproxInt_MultiLineTool_hxx <BRepApprox_TheMultiLineToolOfApprox.hxx>
#include <ApproxInt_MultiLineTool.gxx>

1
src/BRepApprox/FILES
View File

@ -46,7 +46,6 @@ BRepApprox_TheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx
BRepApprox_TheMultiLineOfApprox.hxx
BRepApprox_TheMultiLineOfApprox_0.cxx
BRepApprox_TheMultiLineToolOfApprox.hxx
BRepApprox_TheMultiLineToolOfApprox_0.cxx
BRepApprox_ThePrmPrmSvSurfacesOfApprox.hxx
BRepApprox_ThePrmPrmSvSurfacesOfApprox_0.cxx
BRepApprox_TheZerImpFuncOfTheImpPrmSvSurfacesOfApprox.hxx

20
src/Blend/Blend_Debug.cxx
View File

@ -16,26 +16,14 @@
#include <Standard_Boolean.hxx>
#ifndef __Blend_API
# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __Blend_DLL
# define __Blend_API __declspec( dllexport )
# else
# define __Blend_API __declspec( dllimport )
# endif /*__Blend_DLL*/
# else
# define __Blend_API
# endif /*_WIN32*/
#endif /*__Blend_API*/
//*************************************************
// recuperation des surfaces des conges approximes.
//*************************************************
static Standard_Boolean Blend_traceDRAWSECT = Standard_False;
__Blend_API extern void Blend_SettraceDRAWSECT(const Standard_Boolean b)
void Blend_SettraceDRAWSECT(const Standard_Boolean b)
{ Blend_traceDRAWSECT = b; }
__Blend_API extern Standard_Boolean Blend_GettraceDRAWSECT()
Standard_Boolean Blend_GettraceDRAWSECT()
{ return Blend_traceDRAWSECT; }
//*************************************************
@ -43,7 +31,7 @@ __Blend_API extern Standard_Boolean Blend_GettraceDRAWSECT()
//*************************************************
static Standard_Boolean Blend_contextNOTESTDEFL = Standard_False;
__Blend_API extern void Blend_SetcontextNOTESTDEFL(const Standard_Boolean b)
void Blend_SetcontextNOTESTDEFL(const Standard_Boolean b)
{ Blend_contextNOTESTDEFL = b; }
__Blend_API extern Standard_Boolean Blend_GetcontextNOTESTDEFL()
Standard_Boolean Blend_GetcontextNOTESTDEFL()
{ return Blend_contextNOTESTDEFL; }

16
src/Draw/Draw_Appli.hxx
View File

@ -32,21 +32,6 @@ extern void Draw_Appli(int argc, char** argv,
const FDraw_InitAppli Draw_InitAppli);
#endif
#if defined(_WIN32) && !defined(HAVE_NO_DLL)
#ifndef __Draw_API
# ifdef __Draw_DLL
# define __Draw_API __declspec ( dllexport )
# else
# define __Draw_API __declspec ( dllimport )
# endif
#endif
#else
# define __Draw_API
#endif
#ifndef _WIN32
extern Draw_Viewer dout;
extern Standard_Boolean Draw_Batch;
@ -56,7 +41,6 @@ class Draw_SaveAndRestore {
public :
// __Draw_API Draw_SaveAndRestore
Standard_EXPORT Draw_SaveAndRestore
(const char* name,
Standard_Boolean (*test)(const Handle(Draw_Drawable3D)&),

118
src/Draw/Draw_Viewer.hxx
View File

@ -31,16 +31,8 @@
#ifdef _WIN32
#include <windows.h>
#if !defined(__Draw_API) && !defined(HAVE_NO_DLL)
# ifdef __Draw_DLL
# define __Draw_API __declspec( dllexport )
# else
# define __Draw_API /*__declspec( dllimport )*/
# endif
#endif
#else
# define __Draw_API
#endif
const Standard_Integer MAXVIEW = 30;
class Draw_View;
@ -48,72 +40,72 @@ class Draw_View;
class Draw_Viewer {
public :
__Draw_API Draw_Viewer ();
__Draw_API Standard_Boolean DefineColor (const Standard_Integer i,
Standard_EXPORT Draw_Viewer ();
Standard_EXPORT Standard_Boolean DefineColor (const Standard_Integer i,
const char* colname);
__Draw_API void MakeView (const Standard_Integer id,
Standard_EXPORT void MakeView (const Standard_Integer id,
const char* typ,
const Standard_Integer X, const Standard_Integer Y,
const Standard_Integer W, const Standard_Integer H);
// build a view on a given window
#ifdef _WIN32
__Draw_API void MakeView (const Standard_Integer id,
Standard_EXPORT void MakeView (const Standard_Integer id,
const char* typ,
const Standard_Integer X, const Standard_Integer Y,
const Standard_Integer W, const Standard_Integer H,
HWND win,
const Standard_Boolean useBuffer = Standard_False);
#endif
__Draw_API void MakeView (const Standard_Integer id,
Standard_EXPORT void MakeView (const Standard_Integer id,
const char* typ,
const char* window);
__Draw_API void SetTitle (const Standard_Integer id,
Standard_EXPORT void SetTitle (const Standard_Integer id,
const char* name);
__Draw_API void ResetView (const Standard_Integer id);
__Draw_API void SetZoom (const Standard_Integer id,
Standard_EXPORT void ResetView (const Standard_Integer id);
Standard_EXPORT void SetZoom (const Standard_Integer id,
const Standard_Real z);
__Draw_API void RotateView (const Standard_Integer id,
Standard_EXPORT void RotateView (const Standard_Integer id,
const gp_Dir2d&,
const Standard_Real);
__Draw_API void RotateView (const Standard_Integer id,
Standard_EXPORT void RotateView (const Standard_Integer id,
const gp_Pnt&,
const gp_Dir&,
const Standard_Real);
__Draw_API void SetFocal (const Standard_Integer id,
Standard_EXPORT void SetFocal (const Standard_Integer id,
const Standard_Real FocalDist);
__Draw_API char* GetType (const Standard_Integer id) const;
__Draw_API Standard_Real Zoom (const Standard_Integer id) const;
__Draw_API Standard_Real Focal (const Standard_Integer id) const;
__Draw_API void SetTrsf (const Standard_Integer id,
Standard_EXPORT char* GetType (const Standard_Integer id) const;
Standard_EXPORT Standard_Real Zoom (const Standard_Integer id) const;
Standard_EXPORT Standard_Real Focal (const Standard_Integer id) const;
Standard_EXPORT void SetTrsf (const Standard_Integer id,
gp_Trsf& T);
__Draw_API void GetTrsf (const Standard_Integer id,
Standard_EXPORT void GetTrsf (const Standard_Integer id,
gp_Trsf& T) const;
__Draw_API void GetPosSize (const Standard_Integer id,
Standard_EXPORT void GetPosSize (const Standard_Integer id,
Standard_Integer& X, Standard_Integer& Y,
Standard_Integer& W, Standard_Integer& H);
__Draw_API Standard_Boolean Is3D (const Standard_Integer id) const;
__Draw_API void GetFrame (const Standard_Integer id,
Standard_EXPORT Standard_Boolean Is3D (const Standard_Integer id) const;
Standard_EXPORT void GetFrame (const Standard_Integer id,
Standard_Integer& xmin, Standard_Integer& ymin,
Standard_Integer& xmax, Standard_Integer& ymax);
__Draw_API void FitView (const Standard_Integer id, const Standard_Integer frame);
__Draw_API void PanView (const Standard_Integer id,
Standard_EXPORT void FitView (const Standard_Integer id, const Standard_Integer frame);
Standard_EXPORT void PanView (const Standard_Integer id,
const Standard_Integer DX, const Standard_Integer DY);
__Draw_API void SetPan (const Standard_Integer id,
Standard_EXPORT void SetPan (const Standard_Integer id,
const Standard_Integer DX, const Standard_Integer DY);
__Draw_API void GetPan (const Standard_Integer id,
Standard_EXPORT void GetPan (const Standard_Integer id,
Standard_Integer& DX, Standard_Integer& DY);
__Draw_API Standard_Boolean HasView (const Standard_Integer id) const;
__Draw_API void DisplayView (const Standard_Integer id) const;
__Draw_API void HideView (const Standard_Integer id) const;
__Draw_API void ClearView (const Standard_Integer id) const;
__Draw_API void RemoveView (const Standard_Integer id) ;
__Draw_API void RepaintView (const Standard_Integer id) const;
Standard_EXPORT Standard_Boolean HasView (const Standard_Integer id) const;
Standard_EXPORT void DisplayView (const Standard_Integer id) const;
Standard_EXPORT void HideView (const Standard_Integer id) const;
Standard_EXPORT void ClearView (const Standard_Integer id) const;
Standard_EXPORT void RemoveView (const Standard_Integer id) ;
Standard_EXPORT void RepaintView (const Standard_Integer id) const;
#ifdef _WIN32
__Draw_API void ResizeView (const Standard_Integer id) const;
__Draw_API void UpdateView (const Standard_Integer id, const Standard_Boolean forced = Standard_False) const;
Standard_EXPORT void ResizeView (const Standard_Integer id) const;
Standard_EXPORT void UpdateView (const Standard_Integer id, const Standard_Boolean forced = Standard_False) const;
#endif
__Draw_API void ConfigView (const Standard_Integer id) const;
__Draw_API void PostScriptView (const Standard_Integer id,
Standard_EXPORT void ConfigView (const Standard_Integer id) const;
Standard_EXPORT void PostScriptView (const Standard_Integer id,
const Standard_Integer VXmin,
const Standard_Integer VYmin,
const Standard_Integer VXmax,
@ -123,48 +115,48 @@ class Draw_Viewer {
const Standard_Integer PXmax,
const Standard_Integer PYmax,
ostream& sortie) const;
__Draw_API void PostColor(const Standard_Integer icol,
Standard_EXPORT void PostColor(const Standard_Integer icol,
const Standard_Integer width,
const Standard_Real gray);
__Draw_API Standard_Boolean SaveView(const Standard_Integer id, const char* filename);
__Draw_API void RepaintAll () const;
__Draw_API void Repaint2D () const;
__Draw_API void Repaint3D () const;
__Draw_API void DeleteView (const Standard_Integer id);
__Draw_API void Clear ();
__Draw_API void Clear2D ();
__Draw_API void Clear3D ();
__Draw_API void Flush ();
Standard_EXPORT Standard_Boolean SaveView(const Standard_Integer id, const char* filename);
Standard_EXPORT void RepaintAll () const;
Standard_EXPORT void Repaint2D () const;
Standard_EXPORT void Repaint3D () const;
Standard_EXPORT void DeleteView (const Standard_Integer id);
Standard_EXPORT void Clear ();
Standard_EXPORT void Clear2D ();
Standard_EXPORT void Clear3D ();
Standard_EXPORT void Flush ();
__Draw_API void DrawOnView (const Standard_Integer id,
Standard_EXPORT void DrawOnView (const Standard_Integer id,
const Handle(Draw_Drawable3D)& D) const;
__Draw_API void HighlightOnView (const Standard_Integer id,
Standard_EXPORT void HighlightOnView (const Standard_Integer id,
const Handle(Draw_Drawable3D)& D,
const Draw_ColorKind C = Draw_blanc) const;
__Draw_API void AddDrawable (const Handle(Draw_Drawable3D)& D);
__Draw_API void RemoveDrawable (const Handle(Draw_Drawable3D)& D);
__Draw_API Draw_Display MakeDisplay (const Standard_Integer id) const;
Standard_EXPORT void AddDrawable (const Handle(Draw_Drawable3D)& D);
Standard_EXPORT void RemoveDrawable (const Handle(Draw_Drawable3D)& D);
Standard_EXPORT Draw_Display MakeDisplay (const Standard_Integer id) const;
__Draw_API void Select (Standard_Integer& id, // View, -1 if none
Standard_EXPORT void Select (Standard_Integer& id, // View, -1 if none
Standard_Integer& X, // Pick coordinates
Standard_Integer& Y,
Standard_Integer& Button, // Button pressed, 0 if none
Standard_Boolean waitclick = Standard_True
);
__Draw_API Standard_Integer Pick(const Standard_Integer id, // returns the index (or 0)
Standard_EXPORT Standard_Integer Pick(const Standard_Integer id, // returns the index (or 0)
const Standard_Integer X,
const Standard_Integer Y,
const Standard_Integer Prec,
Handle(Draw_Drawable3D)& D,
const Standard_Integer First = 0) const; // search after this drawable
__Draw_API void LastPick(gp_Pnt& P1, gp_Pnt& P2, Standard_Real& Param);
Standard_EXPORT void LastPick(gp_Pnt& P1, gp_Pnt& P2, Standard_Real& Param);
// returns the extremities and parameter of the last picked segment
__Draw_API ~Draw_Viewer();
__Draw_API Draw_Viewer& operator<<(const Handle(Draw_Drawable3D)&);
__Draw_API const Draw_SequenceOfDrawable3D& GetDrawables();
Standard_EXPORT ~Draw_Viewer();
Standard_EXPORT Draw_Viewer& operator<<(const Handle(Draw_Drawable3D)&);
Standard_EXPORT const Draw_SequenceOfDrawable3D& GetDrawables();
private :

88
src/Draw/Draw_Window.hxx
View File

@ -362,14 +362,6 @@ void GetNextEvent (Standard_Boolean theWait,
#define DRAWTITLE L"Draw View"
#define MAXCOLOR 15
#if !defined(__Draw_API) && !defined(HAVE_NO_DLL)
# ifdef __Draw_DLL
# define __Draw_API __declspec( dllexport )
# else
# define __Draw_API __declspec( dllimport )
# endif
#endif
// definition de la classe Segment
class DrawWindow;
@ -421,86 +413,86 @@ public:
*/
Standard_EXPORT static void RemoveCallbackBeforeTerminate(FCallbackBeforeTerminate theCB);
__Draw_API DrawWindow();
__Draw_API DrawWindow(const char*, Standard_Integer, Standard_Integer,
Standard_EXPORT DrawWindow();
Standard_EXPORT DrawWindow(const char*, Standard_Integer, Standard_Integer,
Standard_Integer, Standard_Integer);
__Draw_API DrawWindow(const char*, Standard_Integer, Standard_Integer,
Standard_EXPORT DrawWindow(const char*, Standard_Integer, Standard_Integer,
Standard_Integer, Standard_Integer, HWND);
//destructeur
__Draw_API virtual ~DrawWindow();
Standard_EXPORT virtual ~DrawWindow();
//methods
public:
__Draw_API void Init(Standard_Integer, Standard_Integer,
Standard_EXPORT void Init(Standard_Integer, Standard_Integer,
Standard_Integer, Standard_Integer);
__Draw_API void SetUseBuffer(Standard_Boolean);
Standard_EXPORT void SetUseBuffer(Standard_Boolean);
// Turns on/off usage of off-screen image buffer (can be used for redrawing optimization)
Standard_Boolean GetUseBuffer() const { return myUseBuffer; }
// Returns Standard_True if off-screen image buffer is being used
//taille et position
__Draw_API void SetPosition (Standard_Integer,Standard_Integer);
__Draw_API void SetDimension(Standard_Integer,Standard_Integer);
__Draw_API void GetPosition (Standard_Integer&,Standard_Integer&);
__Draw_API Standard_Integer HeightWin() const;
__Draw_API Standard_Integer WidthWin() const;
Standard_EXPORT void SetPosition (Standard_Integer,Standard_Integer);
Standard_EXPORT void SetDimension(Standard_Integer,Standard_Integer);
Standard_EXPORT void GetPosition (Standard_Integer&,Standard_Integer&);
Standard_EXPORT Standard_Integer HeightWin() const;
Standard_EXPORT Standard_Integer WidthWin() const;
//Title
__Draw_API void SetTitle (const TCollection_AsciiString& );
__Draw_API TCollection_AsciiString GetTitle() const;
Standard_EXPORT void SetTitle (const TCollection_AsciiString& );
Standard_EXPORT TCollection_AsciiString GetTitle() const;
//Affichage
//! Return true if window is displayed on the screen.
bool IsMapped() const;
__Draw_API void DisplayWindow();
__Draw_API void Hide();
__Draw_API void Destroy();
__Draw_API void Clear();
Standard_EXPORT void DisplayWindow();
Standard_EXPORT void Hide();
Standard_EXPORT void Destroy();
Standard_EXPORT void Clear();
static void Flush() {} ;
// save snapshot
__Draw_API Standard_Boolean Save(const char* theFileName) const;
Standard_EXPORT Standard_Boolean Save(const char* theFileName) const;
//Dessin
__Draw_API void DrawString(int,int,char*);
__Draw_API void DrawSegments(Segment*,int);
Standard_EXPORT void DrawString(int,int,char*);
Standard_EXPORT void DrawSegments(Segment*,int);
__Draw_API void InitBuffer();
Standard_EXPORT void InitBuffer();
// Initializes off-screen image buffer according to current window size
__Draw_API void Redraw();
Standard_EXPORT void Redraw();
// Copies an image from memory buffer to screen
//Couleur
__Draw_API void SetColor(Standard_Integer);
__Draw_API void SetMode(int);
__Draw_API static Standard_Boolean DefineColor ( const Standard_Integer,const char*);
Standard_EXPORT void SetColor(Standard_Integer);
Standard_EXPORT void SetMode(int);
Standard_EXPORT static Standard_Boolean DefineColor ( const Standard_Integer,const char*);
//Gestion des Messages
__Draw_API virtual void WExpose ();
__Draw_API virtual void WButtonPress(const Standard_Integer,const Standard_Integer,
Standard_EXPORT virtual void WExpose ();
Standard_EXPORT virtual void WButtonPress(const Standard_Integer,const Standard_Integer,
const Standard_Integer&);
__Draw_API virtual void WButtonRelease(const Standard_Integer,const Standard_Integer,
Standard_EXPORT virtual void WButtonRelease(const Standard_Integer,const Standard_Integer,
const Standard_Integer&);
__Draw_API virtual void WMotionNotify(const Standard_Integer,const Standard_Integer);
__Draw_API virtual void WConfigureNotify(const Standard_Integer,const Standard_Integer,
Standard_EXPORT virtual void WMotionNotify(const Standard_Integer,const Standard_Integer);
Standard_EXPORT virtual void WConfigureNotify(const Standard_Integer,const Standard_Integer,
const Standard_Integer,const Standard_Integer);
__Draw_API virtual void WUnmapNotify();
Standard_EXPORT virtual void WUnmapNotify();
//Gestion souris
__Draw_API static void SelectWait (HANDLE&,int&,int&,int&);
__Draw_API static void SelectNoWait (HANDLE&,int&,int&,int&);
Standard_EXPORT static void SelectWait (HANDLE&,int&,int&,int&);
Standard_EXPORT static void SelectNoWait (HANDLE&,int&,int&,int&);
// Procedure de fenetre
__Draw_API static LRESULT APIENTRY DrawProc (HWND,UINT,WPARAM,LPARAM);
Standard_EXPORT static LRESULT APIENTRY DrawProc (HWND,UINT,WPARAM,LPARAM);
private:
__Draw_API static HWND CreateDrawWindow(HWND,int);
__Draw_API HDC GetMemDC(HDC);
__Draw_API void ReleaseMemDC(HDC);
Standard_EXPORT static HWND CreateDrawWindow(HWND,int);
Standard_EXPORT HDC GetMemDC(HDC);
Standard_EXPORT void ReleaseMemDC(HDC);
//atributs
public:
@ -526,9 +518,9 @@ typedef enum {
// PROCEDURE DE DRAW WINDOW
__Draw_API Standard_Boolean Init_Appli(HINSTANCE,HINSTANCE,int,HWND&);
__Draw_API void Run_Appli(HWND);
__Draw_API void Destroy_Appli(HINSTANCE);
Standard_EXPORT Standard_Boolean Init_Appli(HINSTANCE,HINSTANCE,int,HWND&);
Standard_EXPORT void Run_Appli(HWND);
Standard_EXPORT void Destroy_Appli(HINSTANCE);
#endif

25
src/Expr/Expr_Operators.hxx
View File

@ -25,55 +25,30 @@
#include <Expr_Product.hxx>
#include <Expr_Division.hxx>
#ifndef __Expr_API
# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __Expr_DLL
# define __Expr_API __declspec( dllexport )
# else
# define __Expr_API __declspec( dllimport )
# endif // __Expr_DLL
# else
# define __Expr_API
# endif // _WIN32
#endif // __Expr_API
//__Expr_API Handle(Expr_Sum) operator+(const Handle(Expr_GeneralExpression)& x,const Handle(Expr_GeneralExpression)& y);
Standard_EXPORT Handle(Expr_Sum) operator+(const Handle(Expr_GeneralExpression)& x,const Handle(Expr_GeneralExpression)& y);
//__Expr_API Handle(Expr_Sum) operator+(const Standard_Real x,const Handle(Expr_GeneralExpression)& y);
Standard_EXPORT Handle(Expr_Sum) operator+(const Standard_Real x,const Handle(Expr_GeneralExpression)& y);
//__Expr_API Handle(Expr_Sum) operator+(const Handle(Expr_GeneralExpression)& x, const Standard_Real y);
Standard_EXPORT Handle(Expr_Sum) operator+(const Handle(Expr_GeneralExpression)& x, const Standard_Real y);
//__Expr_API Handle(Expr_Difference) operator-(const Handle(Expr_GeneralExpression)& x, const Handle(Expr_GeneralExpression)& y);
Standard_EXPORT Handle(Expr_Difference) operator-(const Handle(Expr_GeneralExpression)& x, const Handle(Expr_GeneralExpression)& y);
//__Expr_API Handle(Expr_Difference) operator-(const Standard_Real x, const Handle(Expr_GeneralExpression)& y);
Standard_EXPORT Handle(Expr_Difference) operator-(const Standard_Real x, const Handle(Expr_GeneralExpression)& y);
//__Expr_API Handle(Expr_Difference) operator-(const Handle(Expr_GeneralExpression)& x, const Standard_Real y);
Standard_EXPORT Handle(Expr_Difference) operator-(const Handle(Expr_GeneralExpression)& x, const Standard_Real y);
//__Expr_API Handle(Expr_UnaryMinus) operator-(const Handle(Expr_GeneralExpression)& x);
Standard_EXPORT Handle(Expr_UnaryMinus) operator-(const Handle(Expr_GeneralExpression)& x);
//__Expr_API Handle(Expr_Product) operator*(const Handle(Expr_GeneralExpression)& x, const Handle(Expr_GeneralExpression)& y);
Standard_EXPORT Handle(Expr_Product) operator*(const Handle(Expr_GeneralExpression)& x, const Handle(Expr_GeneralExpression)& y);
//__Expr_API Handle(Expr_Product) operator*(const Standard_Real x, const Handle(Expr_GeneralExpression)& y);
Standard_EXPORT Handle(Expr_Product) operator*(const Standard_Real x, const Handle(Expr_GeneralExpression)& y);
//__Expr_API Handle(Expr_Product) operator*(const Handle(Expr_GeneralExpression)& x, const Standard_Real y);
Standard_EXPORT Handle(Expr_Product) operator*(const Handle(Expr_GeneralExpression)& x, const Standard_Real y);
//__Expr_API Handle(Expr_Division) operator/(const Handle(Expr_GeneralExpression)& x, const Handle(Expr_GeneralExpression)& y);
Standard_EXPORT Handle(Expr_Division) operator/(const Handle(Expr_GeneralExpression)& x, const Handle(Expr_GeneralExpression)& y);
//__Expr_API Handle(Expr_Division) operator/(const Standard_Real x, const Handle(Expr_GeneralExpression)& y);
Standard_EXPORT Handle(Expr_Division) operator/(const Standard_Real x, const Handle(Expr_GeneralExpression)& y);
//__Expr_API Handle(Expr_Division) operator/(const Handle(Expr_GeneralExpression)& x, const Standard_Real y);
Standard_EXPORT Handle(Expr_Division) operator/(const Handle(Expr_GeneralExpression)& x, const Standard_Real y);

5
src/ExprIntrp/ExprIntrp_Generator.cxx
View File

@ -24,9 +24,8 @@
IMPLEMENT_STANDARD_RTTIEXT(ExprIntrp_Generator,Standard_Transient)
//#include <ExprIntrp_yaccanal.hxx>
Standard_EXPORT ExprIntrp_Analysis ExprIntrp_Recept;
#include <ExprIntrp_yaccanal.hxx>
ExprIntrp_Analysis ExprIntrp_Recept;
ExprIntrp_Generator::ExprIntrp_Generator()
{

17
src/ExprIntrp/ExprIntrp_yaccanal.hxx
View File

@ -19,21 +19,6 @@
#include <ExprIntrp_Analysis.hxx>
#ifndef _ExprIntrp_API
# if !defined(_WIN32) || defined(__ExprIntrp_DLL) || defined(__Expr_DLL) || defined(__ExprIntrp_DLL) || defined(__math_DLL) || defined(__MathBase_DLL) || defined(__ElCLib_DLL) || defined(__ElSLib_DLL) || defined(__BSplCLib_DLL) || defined(__BSplSLib_DLL) || defined(__Smoothing_DLL) || defined(__SysBase_DLL) || defined(__Data_DLL) || defined(__PLib_DLL) || defined(__GeomAbs_DLL) || defined(__Poly_DLL) || defined(__CSLib_DLL) || defined(__Convert_DLL) || defined(__Bnd_DLL) || defined(__gp_DLL) || defined(__TColgp_DLL)
# define __ExprIntrp_API Standard_EXPORT
# define __ExprIntrp_APIEXTERN Standard_EXPORTEXTERN
# else
# define __ExprIntrp_API Standard_IMPORT
# define __ExprIntrp_APIEXTERN Standard_IMPORT
# endif // __ExprIntrp_DLL
#endif // __ExprIntrp_API
//extern __ExprIntrp_API Standard_EXPORT ExprIntrp_Analysis ExprIntrp_Recept;
#ifdef _ExprIntrp_Analysis_SourceFile
__ExprIntrp_API ExprIntrp_Analysis ExprIntrp_Recept;
#else
__ExprIntrp_APIEXTERN ExprIntrp_Analysis ExprIntrp_Recept;
#endif
extern ExprIntrp_Analysis ExprIntrp_Recept;
#endif

1
src/GeomAPI/FILES
View File

@ -13,7 +13,6 @@ GeomAPI_IntCS.cxx
GeomAPI_IntCS.hxx
GeomAPI_Interpolate.cxx
GeomAPI_Interpolate.hxx
GeomAPI_IntSS.cxx
GeomAPI_IntSS.hxx
GeomAPI_IntSS.lxx
GeomAPI_PointsToBSpline.cxx

22
src/GeomAPI/GeomAPI_IntSS.cxx
View File

@ -1,22 +0,0 @@
// Created on: 1995-03-14
// Created by: Jacques GOUSSARD
// Copyright (c) 1995-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
#include <GeomAPI_IntSS.hxx>
#include <Standard_OutOfRange.hxx>
#include <StdFail_NotDone.hxx>

42
src/GeomInt/GeomInt_WLApprox.hxx
View File

@ -49,29 +49,29 @@ class GeomInt_TheComputeLineBezierOfWLApprox;
class GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox;
class AppParCurves_MultiBSpCurve;
struct Approx_Data
{
Approx_Data() : myBezierApprox(Standard_True),
Xo(0.0), Yo(0.0), Zo(0.0),
U1o(0.0), V1o(0.0), U2o(0.0), V2o(0.0),
ApproxXYZ(Standard_True),
ApproxU1V1(Standard_True),
ApproxU2V2(Standard_True),
indicemin(0), indicemax(0),
myNbPntMax(30), parametrization(Approx_ChordLength)
{
}
Standard_Boolean myBezierApprox;
Standard_Real Xo, Yo, Zo, U1o, V1o, U2o, V2o;
Standard_Boolean ApproxXYZ, ApproxU1V1, ApproxU2V2;
Standard_Integer indicemin, indicemax, myNbPntMax;
Approx_ParametrizationType parametrization;
};
class GeomInt_WLApprox
{
private:
struct Approx_Data
{
Approx_Data () : myBezierApprox (Standard_True),
Xo (0.0), Yo (0.0), Zo (0.0),
U1o (0.0), V1o (0.0), U2o (0.0), V2o (0.0),
ApproxXYZ (Standard_True),
ApproxU1V1 (Standard_True),
ApproxU2V2 (Standard_True),
indicemin (0), indicemax (0),
myNbPntMax (30), parametrization (Approx_ChordLength)
{
}
Standard_Boolean myBezierApprox;
Standard_Real Xo, Yo, Zo, U1o, V1o, U2o, V2o;
Standard_Boolean ApproxXYZ, ApproxU1V1, ApproxU2V2;
Standard_Integer indicemin, indicemax, myNbPntMax;
Approx_ParametrizationType parametrization;
};
public:
DEFINE_STANDARD_ALLOC

1
src/HLRBRep/FILES
View File

@ -86,7 +86,6 @@ HLRBRep_ShapeToHLR.cxx
HLRBRep_ShapeToHLR.hxx
HLRBRep_SLProps.hxx
HLRBRep_SLProps_0.cxx
HLRBRep_SLPropsATool.cxx
HLRBRep_SLPropsATool.hxx
HLRBRep_SLPropsATool.lxx
HLRBRep_Surface.cxx

20
src/HLRBRep/HLRBRep_SLPropsATool.cxx
View File

@ -1,20 +0,0 @@
// Created on: 1992-08-18
// Created by: Herve LEGRAND
// Copyright (c) 1992-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <gp_Pnt.hxx>
#include <gp_Vec.hxx>
#include <HLRBRep_SLPropsATool.hxx>

2
src/IVtkTools/IVtkTools.cxx
View File

@ -124,7 +124,7 @@ void InitShapeMapper (vtkMapper* theMapper, vtkLookupTable* theColorTable)
{
theMapper->ScalarVisibilityOn();
theMapper->SetScalarModeToUseCellFieldData();
theMapper->SelectColorArray (IVtkVTK_ShapeData::ARRNAME_MESH_TYPES);
theMapper->SelectColorArray (IVtkVTK_ShapeData::ARRNAME_MESH_TYPES());
theMapper->SetColorModeToMapScalars();
theMapper->SetScalarRange (theColorTable->GetRange());
theMapper->SetLookupTable (theColorTable);

10
src/IVtkTools/IVtkTools.hxx
View File

@ -19,16 +19,6 @@
#include <IVtk_Types.hxx>
#include <vtkSmartPointer.h>
#if defined(_WIN32) && !defined(HAVE_NO_DLL)
#ifdef __IVtkTools_DLL
#define IVtkTools_EXPORT __declspec( dllexport )
#else
#define IVtkTools_EXPORT __declspec( dllimport )
#endif
#else
#define IVtkTools_EXPORT
#endif
class vtkLookupTable;
class vtkMapper;

2
src/IVtkTools/IVtkTools_DisplayModeFilter.cxx
View File

@ -38,7 +38,7 @@ IVtkTools_DisplayModeFilter::IVtkTools_DisplayModeFilter()
myDoDisplaySharedVertices (false)
{
// Filter according to values in subshapes types array.
myIdsArrayName = IVtkVTK_ShapeData::ARRNAME_MESH_TYPES;
myIdsArrayName = IVtkVTK_ShapeData::ARRNAME_MESH_TYPES();
IVtk_IdTypeMap aTypes;

2
src/IVtkTools/IVtkTools_ShapeDataSource.cxx
View File

@ -167,7 +167,7 @@ int IVtkTools_ShapeDataSource::RequestData(vtkInformation *vtkNotUsed(the
vtkSmartPointer<vtkIdTypeArray> IVtkTools_ShapeDataSource::SubShapeIDs()
{
vtkSmartPointer<vtkDataArray> arr =
GetOutput()->GetCellData()->GetArray(IVtkVTK_ShapeData::ARRNAME_SUBSHAPE_IDS);
GetOutput()->GetCellData()->GetArray(IVtkVTK_ShapeData::ARRNAME_SUBSHAPE_IDS());
return vtkSmartPointer<vtkIdTypeArray>(
vtkIdTypeArray::SafeDownCast(arr.GetPointer()) );
}

2
src/IVtkTools/IVtkTools_ShapeDataSource.hxx
View File

@ -31,7 +31,7 @@ class vtkPolyData;
//! @class IVtkTools_ShapeDataSource.
//! @brief VTK data source for OCC shapes polygonal data.
class IVtkTools_EXPORT IVtkTools_ShapeDataSource : public vtkPolyDataAlgorithm
class Standard_EXPORT IVtkTools_ShapeDataSource : public vtkPolyDataAlgorithm
{
public:

2
src/IVtkTools/IVtkTools_ShapeObject.hxx
View File

@ -47,7 +47,7 @@ class IVtkTools_ShapeDataSource;
//! It stores data of OCC shape (the OccShape instance) in vtkInformation object of vtkDataObject.
//! Then pass it to the actors through pipelines,
//! so selection logic can access OccShape easily given the actor instance.
class IVtkTools_EXPORT IVtkTools_ShapeObject : public vtkDataObject
class Standard_EXPORT IVtkTools_ShapeObject : public vtkDataObject
{
public:
vtkTypeMacro (IVtkTools_ShapeObject, vtkObject)

2
src/IVtkTools/IVtkTools_ShapePicker.hxx
View File

@ -40,7 +40,7 @@ class vtkActorCollection;
//! @class IVtkTools_ShapePicker
//! @brief VTK picker for OCC shapes with OCC selection algorithm.
class IVtkTools_EXPORT IVtkTools_ShapePicker : public vtkAbstractPropPicker
class Standard_EXPORT IVtkTools_ShapePicker : public vtkAbstractPropPicker
{
public:
vtkTypeMacro(IVtkTools_ShapePicker, vtkAbstractPropPicker)

2
src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
View File

@ -38,7 +38,7 @@ vtkStandardNewMacro(IVtkTools_SubPolyDataFilter)
//================================================================
IVtkTools_SubPolyDataFilter::IVtkTools_SubPolyDataFilter()
{
myIdsArrayName = IVtkVTK_ShapeData::ARRNAME_SUBSHAPE_IDS;
myIdsArrayName = IVtkVTK_ShapeData::ARRNAME_SUBSHAPE_IDS();
myDoFiltering = true;
}

2
src/IVtkTools/IVtkTools_SubPolyDataFilter.hxx
View File

@ -27,7 +27,7 @@
//! @class IVtkTools_SubPolyDataFilter
//! @brief Cells filter according to the given set of cells ids.
class IVtkTools_EXPORT IVtkTools_SubPolyDataFilter : public vtkPolyDataAlgorithm
class Standard_EXPORT IVtkTools_SubPolyDataFilter : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(IVtkTools_SubPolyDataFilter,vtkPolyDataAlgorithm)

11
src/IVtkVTK/IVtkVTK_ShapeData.cxx
View File

@ -31,13 +31,6 @@
IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_ShapeData,IVtk_IShapeData)
const char* const IVtkVTK_ShapeData::ARRNAME_SUBSHAPE_IDS = "SUBSHAPE_IDS";
const char* const IVtkVTK_ShapeData::ARRNAME_MESH_TYPES = "MESH_TYPES";
//! Handle implementation
//================================================================
// Function : Constructor
// Purpose :
@ -49,12 +42,12 @@ IVtkVTK_ShapeData::IVtkVTK_ShapeData()
myPolyData->SetPoints (vtkSmartPointer<vtkPoints>::New());
mySubShapeIDs = vtkSmartPointer<vtkIdTypeArray>::New();
mySubShapeIDs->SetName (IVtkVTK_ShapeData::ARRNAME_SUBSHAPE_IDS);
mySubShapeIDs->SetName (IVtkVTK_ShapeData::ARRNAME_SUBSHAPE_IDS());
mySubShapeIDs->SetNumberOfComponents (1);
myPolyData->GetCellData()->AddArray (mySubShapeIDs);
myMeshTypes = vtkSmartPointer<vtkIdTypeArray>::New();
myMeshTypes->SetName (IVtkVTK_ShapeData::ARRNAME_MESH_TYPES);
myMeshTypes->SetName (IVtkVTK_ShapeData::ARRNAME_MESH_TYPES());
myMeshTypes->SetNumberOfComponents (1);
myPolyData->GetCellData()->AddArray (myMeshTypes);
}

17
src/IVtkVTK/IVtkVTK_ShapeData.hxx
View File

@ -33,19 +33,6 @@ class vtkIdTypeArray;
class IVtkVTK_ShapeData;
DEFINE_STANDARD_HANDLE( IVtkVTK_ShapeData, IVtk_IShapeData )
// macros to export static field in class
#ifndef IVtkVTK_EXPORT
#ifdef _WIN32
#ifdef __IVtkVTK_DLL
#define IVtkVTK_EXPORT __declspec(dllexport)
#else
#define IVtkVTK_EXPORT __declspec(dllimport)
#endif
#else
#define IVtkVTK_EXPORT
#endif
#endif
//! @class IVtkVTK_ShapeData
//! @brief IShapeData implementation for VTK.
//!
@ -54,8 +41,8 @@ class IVtkVTK_ShapeData : public IVtk_IShapeData
{
public:
IVtkVTK_EXPORT static const char* const ARRNAME_SUBSHAPE_IDS;
IVtkVTK_EXPORT static const char* const ARRNAME_MESH_TYPES;
static const char* ARRNAME_SUBSHAPE_IDS() { return "SUBSHAPE_IDS"; }
static const char* ARRNAME_MESH_TYPES() { return "MESH_TYPES"; }
typedef Handle(IVtkVTK_ShapeData) Handle;

17
src/IntImp/IntImp_ComputeTangence.cxx
View File

@ -14,6 +14,7 @@
#include <IntImp_ComputeTangence.hxx>
#include <IntImp_ConstIsoparametric.hxx>
#include <Standard_OutOfRange.hxx>
static const IntImp_ConstIsoparametric staticChoixRef [4] = {
IntImp_UIsoparametricOnCaro1,
@ -22,7 +23,11 @@ IntImp_UIsoparametricOnCaro2,
IntImp_VIsoparametricOnCaro2,
};
Standard_EXPORT const IntImp_ConstIsoparametric *ChoixRef = staticChoixRef ;
IntImp_ConstIsoparametric ChoixRef (Standard_Integer theIndex)
{
Standard_OutOfRange_Raise_if (theIndex < 0 || theIndex > 3, "ChoixRef() in " __FILE__)
return staticChoixRef[theIndex];
}
//=======================================================================
//function : IntImp_ComputeTangence
@ -131,7 +136,10 @@ Standard_Boolean IntImp_ComputeTangence(const gp_Vec DPuv[],
Standard_Boolean triOk = Standard_False;
Standard_Real t;
IntImp_ConstIsoparametric ti;
for ( i=0;i<=3;i++) TabIso[i] = ChoixRef[i];
for ( i=0;i<=3;i++)
{
TabIso[i] = staticChoixRef[i];
}
do {
triOk = Standard_True;
for(i=1;i<=3;i++) {
@ -168,7 +176,10 @@ Standard_Boolean IntImp_ComputeTangence(const gp_Vec DPuv[],
NormDuv[II] = NormDuv[j];
NormDuv[j] = Tampon;
}
for (j=0; j<=3;j++) TabIso[j]=ChoixRef[Irang[j]];
for (j=0; j<=3;j++)
{
TabIso[j] = staticChoixRef[Irang[j]];
}
#endif
}
return tangent;

13
src/IntImp/IntImp_ComputeTangence.hxx
View File

@ -15,20 +15,9 @@
#include <gp_Vec.hxx>
#include <IntImp_ConstIsoparametric.hxx>
#if !defined(_WIN32) || defined(__ApproxInt_DLL) || defined(__IntImp_DLL) || defined(__IntWalk_DLL) || defined(__GeomInt_DLL) || defined(__IntPatch_DLL)
Standard_EXPORTEXTERN const IntImp_ConstIsoparametric *ChoixRef;
#else
Standard_IMPORT const IntImp_ConstIsoparametric *ChoixRef;
#endif
Standard_EXPORT IntImp_ConstIsoparametric ChoixRef (Standard_Integer theIndex);
Standard_EXPORT Standard_Boolean IntImp_ComputeTangence(const gp_Vec DPuv[],
const Standard_Real EpsUV[],
Standard_Real Tgduv[],
IntImp_ConstIsoparametric TabIso[]);

9
src/IntImp/IntImp_Int2S.gxx
View File

@ -25,9 +25,6 @@
#include <Standard_ConstructionError.hxx>
#include <Precision.hxx>
//Standard_IMPORT extern IntImp_ConstIsoparametric *ChoixRef;
IntImp_Int2S::IntImp_Int2S(const ThePSurface& surf1,
const ThePSurface& surf2,
const Standard_Real TolTangency ) :
@ -131,7 +128,7 @@ IntImp_ConstIsoparametric IntImp_Int2S:: Perform(const TColStd_Array1OfReal& Par
TColStd_Array1OfReal Duv (DuvBuf[0], 1, 4);
Standard_Real UVd[4],UVf[4];
IntImp_ConstIsoparametric ChoixIso[4];
IntImp_ConstIsoparametric BestChoix=ChoixRef[0];
IntImp_ConstIsoparametric BestChoix = ChoixRef(0);
const ThePSurface& Caro1 = myZerParFunc.AuxillarSurface1();
const ThePSurface& Caro2 = myZerParFunc.AuxillarSurface2();
@ -220,7 +217,7 @@ IntImp_ConstIsoparametric IntImp_Int2S:: Perform(const TColStd_Array1OfReal& Par
}
else return BestChoix; // on a gagne
empty = Standard_True;
BestChoix = ChoixRef[Iiso]; //en attendant
BestChoix = ChoixRef(Iiso); //en attendant
BestChoix = Perform(Duv,Rsnld,BestChoix);
if (!empty) { // verification si l on ne deborde pas sur le carreau
// reciproque
@ -247,7 +244,7 @@ IntImp_ConstIsoparametric IntImp_Int2S:: Perform(const TColStd_Array1OfReal& Par
if(Nc == 4)
Nc = 0;
BestChoix = ChoixRef[Nc]; //en attendant
BestChoix = ChoixRef(Nc); //en attendant
BestChoix = Perform(Duv,Rsnld,BestChoix);
}
}

2
src/IntWalk/IntWalk_PWalking.cxx
View File

@ -3497,7 +3497,7 @@ TestArret(const Standard_Boolean DejaReparti,
}
}
if(k!=-1) {
ChoixIso = ChoixRef[k];
ChoixIso = ChoixRef(k);
}
else {
if((ParC[0]<=Uvd[0]+Epsuv[0]) || (ParC[0]>=Uvf[0]-Epsuv[0])) {

2
src/MAT2d/FILES
View File

@ -30,7 +30,5 @@ MAT2d_MiniPath.hxx
MAT2d_SequenceOfConnexion.hxx
MAT2d_SequenceOfSequenceOfCurve.hxx
MAT2d_SequenceOfSequenceOfGeometry.hxx
MAT2d_SketchExplorer.cxx
MAT2d_SketchExplorer.hxx
MAT2d_Tool2d.cxx
MAT2d_Tool2d.hxx

15
src/MAT2d/MAT2d_SketchExplorer.cxx
View File

@ -1,15 +0,0 @@
// Created on: 1993-07-13
// Created by: Yves FRICAUD
// Copyright (c) 1993-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.

80
src/MAT2d/MAT2d_SketchExplorer.hxx
View File

@ -1,80 +0,0 @@
// Created on: 1993-07-12
// Created by: Yves FRICAUD
// Copyright (c) 1993-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _MAT2d_SketchExplorer_HeaderFile
#define _MAT2d_SketchExplorer_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Boolean.hxx>
class Geom2d_Curve;
//! SketchExplorer is an iterator on a sketch. A
//! sketch is a set of contours, each contour is a set
//! of curves from Geom2d.
//! It's use by BisectingLocus.
class MAT2d_SketchExplorer
{
public:
DEFINE_STANDARD_ALLOC
//! Returns the number of contours in the figure.
Standard_EXPORT Standard_Integer NumberOfContours() const;
//! Initializes the curves explorer on the contour
//! of range <ContourIndex>.
Standard_EXPORT void Init (const Standard_Integer ContourIndex);
//! Returns False if there is no more curves on the
//! current contour.
Standard_EXPORT Standard_Boolean More() const;
//! Moves to the next curve of the current contour.
Standard_EXPORT void Next();
//! Returns the current curve on the current contour.
Standard_EXPORT Handle(Geom2d_Curve) Value() const;
protected:
private:
};
#endif // _MAT2d_SketchExplorer_HeaderFile

71
src/NCollection/NCollection_EBTree.hxx
View File

@ -48,20 +48,44 @@ template <class TheObjType, class TheBndType> class NCollection_EBTree
: UBTree (theAllocator) {}
/**
* Updates the tree with a new object and its bounding box.
* Extends the functionality of the parent method by maintaining
* the map myObjNodeMap. Redefined virtual method
* the map myObjNodeMap. Redefined virtual method.
* @return
* False if the tree already contains theObj.
*/
Standard_EXPORT Standard_Boolean Add (const TheObjType& theObj,
const TheBndType& theBnd);
Standard_Boolean Add (const TheObjType& theObj, const TheBndType& theBnd) Standard_OVERRIDE
{
Standard_Boolean result = Standard_False;
if (!Contains (theObj))
{
// Add object in the tree using parent method
UBTree::Add (theObj, theBnd);
// Update the map
TreeNode& aNewNode = this->ChangeLastNode ();
myObjNodeMap.Bind (theObj, &aNewNode);
// If the new node is not the root (has a parent) check the neighbour node
if (!aNewNode.IsRoot ())
{
TreeNode& aNeiNode = aNewNode.ChangeParent ().ChangeChild (0);
if (aNeiNode.IsLeaf ())
{
myObjNodeMap.UnBind (aNeiNode.Object ());
myObjNodeMap.Bind (aNeiNode.Object (), &aNeiNode);
}
}
result = Standard_True;
}
return result;
}
/**
* Removes the given object and updates the tree.
* @return
* False if the tree does not contain theObj
*/
Standard_EXPORT Standard_Boolean Remove (const TheObjType& theObj);
Standard_Boolean Remove (const TheObjType& theObj);
/**
* @return
@ -80,8 +104,11 @@ template <class TheObjType, class TheBndType> class NCollection_EBTree
/**
* Clears the contents of the tree. Redefined virtual method
*/
void Clear (const Handle(NCollection_BaseAllocator)& aNewAlloc = 0L)
{ myObjNodeMap.Clear(); UBTree::Clear(aNewAlloc); }
void Clear (const Handle(NCollection_BaseAllocator)& aNewAlloc = 0L) Standard_OVERRIDE
{
myObjNodeMap.Clear ();
UBTree::Clear (aNewAlloc);
}
private:
// ---------- PRIVATE METHODS ----------
@ -100,38 +127,6 @@ template <class TheObjType, class TheBndType> class NCollection_EBTree
// ================== METHODS TEMPLATES =====================
//=======================================================================
//function : Add
//purpose : Updates the tree with a new object and its bounding box.
// Returns false if the tree already contains theObj.
//=======================================================================
template <class TheObjType, class TheBndType>
Standard_Boolean NCollection_EBTree<TheObjType,TheBndType>::Add
(const TheObjType& theObj,
const TheBndType& theBnd)
{
Standard_Boolean result = Standard_False;
if (!Contains (theObj)) {
// Add object in the tree using parent method
UBTree::Add (theObj, theBnd);
// Update the map
TreeNode& aNewNode = this->ChangeLastNode();
myObjNodeMap.Bind (theObj, &aNewNode);
// If the new node is not the root (has a parent) check the neighbour node
if (!aNewNode.IsRoot()) {
TreeNode& aNeiNode = aNewNode.ChangeParent().ChangeChild(0);
if (aNeiNode.IsLeaf()) {
myObjNodeMap.UnBind (aNeiNode.Object());
myObjNodeMap.Bind (aNeiNode.Object(), &aNeiNode);
}
}
result = Standard_True;
}
return result;
}
//=======================================================================
//function : Remove
//purpose : Removes the given object and updates the tree.

2
src/OSD/FILES
View File

@ -91,5 +91,3 @@ OSD_Timer.hxx
OSD_WhoAmI.hxx
OSD_WNT.cxx
OSD_WNT.hxx
OSD_WNT_1.hxx
OSD_WNT_BREAK.hxx

2
src/OSD/OSD_Directory.cxx
View File

@ -22,7 +22,7 @@
#include <NCollection_String.hxx>
#ifdef _WIN32
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#include <stdio.h>
#ifndef _INC_TCHAR

2
src/OSD/OSD_File.cxx
View File

@ -29,7 +29,7 @@
#ifdef _WIN32
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#include <stdio.h>
#include <io.h>

2
src/OSD/OSD_FileNode.cxx
View File

@ -373,7 +373,7 @@ Standard_Integer OSD_FileNode::Error()const{
#include <Standard_ProgramError.hxx>
#include <TCollection_ExtendedString.hxx>
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#ifndef _INC_TCHAR
# include <tchar.h>

8
src/OSD/OSD_OpenFile.hxx
View File

@ -33,19 +33,19 @@
//! @param theName name of file encoded in UTF-16
//! @param theMode opening mode
//! @return file handle of opened file
__Standard_API FILE* OSD_OpenFile (const TCollection_ExtendedString& theName,
Standard_EXPORT FILE* OSD_OpenFile (const TCollection_ExtendedString& theName,
const char* theMode);
//! Function retrieves file timestamp.
//! @param theName name of file encoded in UTF-8
//! @return stat.st_ctime value
__Standard_API Standard_Time OSD_FileStatCTime (const char* theName);
Standard_EXPORT Standard_Time OSD_FileStatCTime (const char* theName);
//! Open file descriptor for specified UTF-16 file path.
//! @param theName name of file encoded in UTF-16
//! @param theMode opening mode
//! @return file descriptor on success or -1 on error
__Standard_API int OSD_OpenFileDescriptor (const TCollection_ExtendedString& theName,
Standard_EXPORT int OSD_OpenFileDescriptor (const TCollection_ExtendedString& theName,
::std::ios_base::openmode theMode);
//! Function opens the file buffer.
@ -141,7 +141,7 @@ extern "C" {
//! @param theName name of file encoded in UTF-8
//! @param theMode opening mode
//! @return file handle of opened file
__Standard_API FILE* OSD_OpenFile (const char* theName, const char* theMode);
Standard_EXPORT FILE* OSD_OpenFile (const char* theName, const char* theMode);
#if defined(__cplusplus)
}

2
src/OSD/OSD_Process.cxx
View File

@ -181,7 +181,7 @@ Standard_Integer OSD_Process::Error()const{
#include <Standard_PExtCharacter.hxx>
#include <TCollection_ExtendedString.hxx>
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#include <LMCONS.H> // for UNLEN - maximum user name length GetUserName()
void _osd_wnt_set_error ( OSD_Error&, OSD_WhoAmI, ... );

2
src/OSD/OSD_WNT.cxx
View File

@ -21,7 +21,7 @@
/* ones ) and other convinient functions. */
/******************************************************************************/
/***/
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#include <Strsafe.h>
#include <wchar.h>

111
src/OSD/OSD_WNT.hxx
View File

@ -12,21 +12,102 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef __OSD_WNT_HXX
# define __OSD_WNT_HXX
#ifndef __OSD_WNT_H
# define __OSD_WNT_H
#include <Standard_Stream.hxx>
# ifndef STRICT
# define STRICT
# endif /* STRICT */
# ifndef OSDAPI
# if !defined(HAVE_NO_DLL)
# ifdef __OSD_DLL
# define OSDAPI __declspec( dllexport )
# else
# define OSDAPI __declspec( dllimport )
# endif // __OSD_DLL
# else
# define OSDAPI
# endif
# endif // OSDAPI
# ifndef _INC_WINDOWS
# include <windows.h>
# endif /* _INC_WINDOWS */
#endif // __OSD_WNT_HXX
# ifdef __cplusplus
extern "C" {
# endif /* __cplusplus */
enum DIR_RESPONSE { DIR_ABORT, DIR_RETRY, DIR_IGNORE };
#define FLAG_READ_PIPE 0x00000001
#define FLAG_EOF 0x00000002
#define FLAG_FILE 0x00000004
#define FLAG_DIRECTORY 0x00000008
#define FLAG_PIPE 0x00000010
#define FLAG_SOCKET 0x00000020
#define FLAG_NAMED_PIPE 0x00000040
#define FLAG_DEVICE 0x00000080
#define FLAG_TYPE 0x0000007C
// 2 macros modified for VisualAge
//#define LODWORD( a ) ( DWORD )( ( ( DWORDLONG )( a ) ) & 0x00000000FFFFFFFF )
//#define HIDWORD( a ) ( DWORD )( ( ( DWORDLONG )( a ) ) >> 32 )
#define LODWORD( a ) ( DWORD )( ( ( _int64 )( a ) ) & 0x00000000FFFFFFFF )
#define HIDWORD( a ) ( DWORD )( ( ( _int64 )( a ) ) >> 32 )
typedef struct _file_ace {
ACE_HEADER header;
DWORD dwMask;
PSID pSID;
} FILE_ACE, *PFILE_ACE;
typedef void ( *MOVE_DIR_PROC ) ( LPCWSTR, LPCWSTR );
typedef void ( *COPY_DIR_PROC ) ( LPCWSTR, LPCWSTR );
typedef void ( *DELETE_DIR_PROC ) ( LPCWSTR );
typedef DIR_RESPONSE ( *RESPONSE_DIR_PROC ) ( LPCWSTR );
#define GET_SID( pACE ) ( ( PSID )( ( ( PBYTE )pACE ) + \
sizeof ( ACE_HEADER ) + \
sizeof ( DWORD ) \
) \
)
#define GET_MSK( pACE ) ( ( PDWORD )( ( ( PBYTE )pACE ) + \
sizeof ( ACE_HEADER ) \
) \
)
PSECURITY_DESCRIPTOR AllocSD ( void );
void FreeSD ( PSECURITY_DESCRIPTOR );
LPVOID GetTokenInformationEx ( HANDLE, TOKEN_INFORMATION_CLASS );
void FreeTokenInformation ( LPVOID );
PSECURITY_DESCRIPTOR GetFileSecurityEx ( LPCWSTR, SECURITY_INFORMATION );
void FreeFileSecurity ( PSECURITY_DESCRIPTOR );
PACL CreateAcl ( DWORD );
void FreeAcl ( PACL );
BOOL PredefinedSid ( PSID );
BOOL NtPredefinedSid ( PSID );
PSID AdminSid ( void );
PSID WorldSid ( void );
PSID InteractiveSid ( void );
PSID NetworkSid ( void );
PSID LocalSid ( void );
PSID DialupSid ( void );
PSID BatchSid ( void );
PSID CreatorOwnerSid ( void );
PSID NullSid ( void );
PSID NtSid ( void );
PVOID AllocAccessAllowedAce ( DWORD, BYTE, PSID );
void FreeAce ( PVOID );
BOOL MoveDirectory ( LPCWSTR, LPCWSTR );
BOOL CopyDirectory ( LPCWSTR, LPCWSTR );
void SetMoveDirectoryProc ( MOVE_DIR_PROC );
void SetCopyDirectoryProc ( COPY_DIR_PROC );
void SetResponseDirectoryProc ( RESPONSE_DIR_PROC );
# ifdef __cplusplus
}
# endif /* __cplusplus */
#endif /* __OSD_WNT_H */

125
src/OSD/OSD_WNT_1.hxx
View File

@ -1,125 +0,0 @@
// Copyright (c) 1998-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef __OSD_WNT_H
# define __OSD_WNT_H
# ifndef STRICT
# define STRICT
# endif /* STRICT */
# ifndef _INC_WINDOWS
# include <windows.h>
# endif /* _INC_WINDOWS */
# ifndef OSDAPI
# if !defined(HAVE_NO_DLL)
# ifdef __OSD_DLL
# define OSDAPI __declspec( dllexport )
# else
# define OSDAPI __declspec( dllimport )
# endif /* OSD_DLL */
# else
# define OSDAPI
# endif
# endif /* OSDAPI */
# ifdef __cplusplus
extern "C" {
# endif /* __cplusplus */
enum DIR_RESPONSE { DIR_ABORT, DIR_RETRY, DIR_IGNORE };
#define FLAG_READ_PIPE 0x00000001
#define FLAG_EOF 0x00000002
#define FLAG_FILE 0x00000004
#define FLAG_DIRECTORY 0x00000008
#define FLAG_PIPE 0x00000010
#define FLAG_SOCKET 0x00000020
#define FLAG_NAMED_PIPE 0x00000040
#define FLAG_DEVICE 0x00000080
#define FLAG_TYPE 0x0000007C
// 2 macros modified for VisualAge
//#define LODWORD( a ) ( DWORD )( ( ( DWORDLONG )( a ) ) & 0x00000000FFFFFFFF )
//#define HIDWORD( a ) ( DWORD )( ( ( DWORDLONG )( a ) ) >> 32 )
#define LODWORD( a ) ( DWORD )( ( ( _int64 )( a ) ) & 0x00000000FFFFFFFF )
#define HIDWORD( a ) ( DWORD )( ( ( _int64 )( a ) ) >> 32 )
typedef struct _file_ace {
ACE_HEADER header;
DWORD dwMask;
PSID pSID;
} FILE_ACE, *PFILE_ACE;
typedef void ( *MOVE_DIR_PROC ) ( LPCWSTR, LPCWSTR );
typedef void ( *COPY_DIR_PROC ) ( LPCWSTR, LPCWSTR );
typedef void ( *DELETE_DIR_PROC ) ( LPCWSTR );
typedef DIR_RESPONSE ( *RESPONSE_DIR_PROC ) ( LPCWSTR );
#define GET_SID( pACE ) ( ( PSID )( ( ( PBYTE )pACE ) + \
sizeof ( ACE_HEADER ) + \
sizeof ( DWORD ) \
) \
)
#define GET_MSK( pACE ) ( ( PDWORD )( ( ( PBYTE )pACE ) + \
sizeof ( ACE_HEADER ) \
) \
)
PSECURITY_DESCRIPTOR OSDAPI AllocSD ( void );
void OSDAPI FreeSD ( PSECURITY_DESCRIPTOR );
LPVOID OSDAPI GetTokenInformationEx ( HANDLE, TOKEN_INFORMATION_CLASS );
void OSDAPI FreeTokenInformation ( LPVOID );
PSECURITY_DESCRIPTOR OSDAPI GetFileSecurityEx ( LPCWSTR, SECURITY_INFORMATION );
void OSDAPI FreeFileSecurity ( PSECURITY_DESCRIPTOR );
PACL OSDAPI CreateAcl ( DWORD );
void OSDAPI FreeAcl ( PACL );
BOOL OSDAPI PredefinedSid ( PSID );
BOOL OSDAPI NtPredefinedSid ( PSID );
PSID OSDAPI AdminSid ( void );
PSID OSDAPI WorldSid ( void );
PSID OSDAPI InteractiveSid ( void );
PSID OSDAPI NetworkSid ( void );
PSID OSDAPI LocalSid ( void );
PSID OSDAPI DialupSid ( void );
PSID OSDAPI BatchSid ( void );
PSID OSDAPI CreatorOwnerSid ( void );
PSID OSDAPI NullSid ( void );
PSID OSDAPI NtSid ( void );
PVOID OSDAPI AllocAccessAllowedAce ( DWORD, BYTE, PSID );
void OSDAPI FreeAce ( PVOID );
BOOL OSDAPI MoveDirectory ( LPCWSTR, LPCWSTR );
BOOL OSDAPI CopyDirectory ( LPCWSTR, LPCWSTR );
void OSDAPI SetMoveDirectoryProc ( MOVE_DIR_PROC );
void OSDAPI SetCopyDirectoryProc ( COPY_DIR_PROC );
void OSDAPI SetResponseDirectoryProc ( RESPONSE_DIR_PROC );
# ifdef __cplusplus
}
# endif /* __cplusplus */
#endif /* __OSD_WNT_H */

25
src/OSD/OSD_WNT_BREAK.hxx
View File

@ -1,25 +0,0 @@
// Copyright (c) 1998-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef __OSD_WNT_BREAK_HXX
# define __OSD_WNT_BREAK_HXX
# ifdef _WIN32
# include <OSD.hxx>
# define _TSTBRK() OSD :: ControlBreak ()
# endif // _WIN32
#endif // __OSD_WNT_BREAK_HXX

2
src/OSD/OSD_signal.cxx
View File

@ -53,7 +53,7 @@
#include <Standard_ProgramError.hxx>
#include <Standard_Mutex.hxx>
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#ifdef _MSC_VER
#include <eh.h>

2
src/Quantity/FILES
View File

@ -22,8 +22,6 @@ Quantity_Conductivity.hxx
Quantity_Constant.hxx
Quantity_Consumption.hxx
Quantity_Content.hxx
Quantity_Convert.cxx
Quantity_Convert.hxx
Quantity_Date.cxx
Quantity_Date.hxx
Quantity_DateDefinitionError.hxx

122
src/Quantity/Quantity_Convert.cxx
View File

@ -1,122 +0,0 @@
// Copyright (c) 1998-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <Quantity_Convert.hxx>
#include <TCollection_AsciiString.hxx>
Standard_EXPORT NCollection_Array1<Standard_Real> ConvertTable(1,68);
static Standard_CString theEnums[] = { // En attendant la methode "Elements" de Standard_Type
"Quantity_MASS",
"Quantity_PLANEANGLE",
"Quantity_SOLIDANGLE",
"Quantity_LENGTH",
"Quantity_AREA",
"Quantity_VOLUME",
"Quantity_SPEED",
"Quantity_VELOCITY",
"Quantity_ACCELERATION",
"Quantity_ANGULARVELOCITY",
"Quantity_FREQUENCY",
"Quantity_TEMPERATURE",
"Quantity_AMOUNTOFSUBSTANCE",
"Quantity_DENSITY",
"Quantity_MASSFLOW",
"Quantity_VOLUMEFLOW",
"Quantity_CONSUMPTION",
"Quantity_MOMENTUM",
"Quantity_KINETICMOMENT",
"Quantity_MOMENTOFINERTIA",
"Quantity_FORCE",
"Quantity_MOMENTOFAFORCE",
"Quantity_TORQUE",
"Quantity_WEIGHT",
"Quantity_PRESSURE",
"Quantity_VISCOSITY",
"Quantity_KINEMATICVISCOSITY",
"Quantity_ENERGY",
"Quantity_WORK",
"Quantity_POWER",
"Quantity_SURFACETENSION",
"Quantity_COEFFICIENTOFEXPANSION",
"Quantity_THERMALCONDUCTIVITY",
"Quantity_SPECIFICHEATCAPACITY",
"Quantity_ENTROPY",
"Quantity_ENTHALPY",
"Quantity_LUMINOUSINTENSITY",
"Quantity_LUMINOUSFLUX",
"Quantity_LUMINANCE",
"Quantity_ILLUMINANCE",
"Quantity_LUMINOUSEXPOSITION",
"Quantity_LUMINOUSEFFICACITY",
"Quantity_ELECTRICCHARGE",
"Quantity_ELECTRICCURRENT",
"Quantity_ELECTRICFIELDSTRENGTH",
"Quantity_ELECTRICPOTENTIAL",
"Quantity_ELECTRICCAPACITANCE",
"Quantity_MAGNETICFLUX",
"Quantity_MAGNETICFLUXDENSITY",
"Quantity_MAGNETICFIELDSTRENGTH",
"Quantity_RELUCTANCE",
"Quantity_RESISTANCE",
"Quantity_INDUCTANCE",
"Quantity_CAPACITANCE",
"Quantity_IMPEDANCE",
"Quantity_ADMITTANCE",
"Quantity_RESISTIVITY",
"Quantity_CONDUCTIVITY",
"Quantity_MOLARMASS",
"Quantity_MOLARVOLUME",
"Quantity_CONCENTRATION",
"Quantity_MOLARCONCENTRATION",
"Quantity_MOLARITY",
"Quantity_SOUNDINTENSITY",
"Quantity_ACOUSTICINTENSITY",
"Quantity_ACTIVITY",
"Quantity_ABSORBEDDOSE",
"Quantity_DOSEEQUIVALENT" };
//----------------------------------------------------------------------------
// Create
//----------------------------------------------------------------------------
Quantity_Convert::Quantity_Convert () {
// ...On se fixe sur un nombre de grandeurs physiques egal a 68 (temporaire)
// ...Initialisation de la table de correspondance a 1 (Coefficient de conversion
// ...par defaut)
for (Standard_Integer i = 1 ; i <= 68 ; i++) ConvertTable(i) = 1;
}
//----------------------------------------------------------------------------
// IsPhysicalQuantity
//----------------------------------------------------------------------------
Standard_Boolean Quantity_Convert::IsPhysicalQuantity
(const TCollection_AsciiString& aTypeName, TCollection_AsciiString& anEnum)
{
// ... Fabriquer le nom de l'enumeration (Quantity_LENGTH par exemple).
TCollection_AsciiString aPrefixe("Quantity_");
anEnum = aTypeName;
anEnum.UpperCase();
anEnum.Prepend(aPrefixe);
// ... Rechercher si il existe existe une valeur d'enum correspondante a <aTypeName>
Standard_Integer i = 1;
Standard_Boolean Find = Standard_False;
while (i <= 68 && !Find)
{
if (IsEqual(anEnum.ToCString(),theEnums[i-1]))
Find = Standard_True;
else
i++;
}
return Find;
}

94
src/Quantity/Quantity_Convert.hxx
View File

@ -1,94 +0,0 @@
// Created on: 1994-07-19
// Created by: Guest Kernel
// Copyright (c) 1994-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _Quantity_Convert_HeaderFile
#define _Quantity_Convert_HeaderFile
#include <NCollection_Array1.hxx>
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
#include <Quantity_PhysicalQuantity.hxx>
class TCollection_AsciiString;
#ifndef __Quantity_API
#if defined(_WIN32) && !defined(HAVE_NO_DLL)
#ifdef __Quantity_DLL
#define __Quantity_API __declspec(dllexport)
#else
#define __Quantity_API __declspec(dllimport)
#endif
#else
#define __Quantity_API
#endif
#endif
extern __Quantity_API NCollection_Array1<Standard_Real> ConvertTable;
//! Services to manage units conversion between Front-ends and Engines.
//! This conversion is managed by a table of correspondance between the quantities
//! and their "conversion coefficient".
//! This table is implemented like an external array (TCollection_Array1) regarding
//! to the quantities enumeration.
class Standard_DEPRECATED("This class is deprecated - UnitsAPI should be used instead") Quantity_Convert
{
public:
DEFINE_STANDARD_ALLOC
//! Creates an object;
Standard_EXPORT Quantity_Convert();
//! Updates the conversion table (correspondances between
//! Quantities and conversion coefficients).
static void SetQuantity (const Quantity_PhysicalQuantity theQuantity,
const Standard_Real theCoef)
{
if (theQuantity > 0 && theQuantity <= 68)
{
ConvertTable (theQuantity) = theCoef;
}
}
//! Converts, from the conversion table, the value theVal from the user system to the SI system.
static Standard_Real ConvertUserToSI (const Quantity_PhysicalQuantity theQuantity,
const Standard_Real theVal)
{
return theQuantity > 0 && theQuantity <= 68
? theVal * ConvertTable (theQuantity)
: theVal;
}
//! Converts, from the conversion table, the value theVal from the SI system to the user system.
static Standard_Real ConvertSIToUser (const Quantity_PhysicalQuantity theQuantity, const Standard_Real theVal)
{
return theQuantity > 0 && theQuantity <= 68
? (theVal / ConvertTable (theQuantity))
: theVal;
}
//! if (aType is a physical quantity)
//! returns True and the name of the associated PhysicalQuantity .
//! else
//! returns False.
Standard_EXPORT static Standard_Boolean IsPhysicalQuantity (const TCollection_AsciiString& aTypeName, TCollection_AsciiString& anEnum);
};
#endif // _Quantity_Convert_HeaderFile

14
src/Standard/Standard_CString.hxx
View File

@ -32,10 +32,10 @@
#include <Standard_Integer.hxx>
//! Returns bounded hash code for a null-terminated string, in range [1, theUpper]
__Standard_API Standard_Integer HashCode (const Standard_CString theStr, const Standard_Integer theUpper);
Standard_EXPORT Standard_Integer HashCode (const Standard_CString theStr, const Standard_Integer theUpper);
//! Returns 32-bit hash code for the first theLen characters in the string theStr
__Standard_API Standard_Integer HashCodes (const Standard_CString theStr, const Standard_Integer theLen);
Standard_EXPORT Standard_Integer HashCodes (const Standard_CString theStr, const Standard_Integer theLen);
//! Returns bounded hash code for the first theLen characters in
//! the string theStr, in range [1, theUpper]
@ -60,19 +60,19 @@ extern "C" {
#endif /* __cplusplus */
//! Equivalent of standard C function atof() that always uses C locale
__Standard_API double Atof (const char* theStr);
Standard_EXPORT double Atof (const char* theStr);
//! Optimized equivalent of standard C function strtod() that always uses C locale
__Standard_API double Strtod (const char* theStr, char** theNextPtr);
Standard_EXPORT double Strtod (const char* theStr, char** theNextPtr);
//! Equivalent of standard C function printf() that always uses C locale
__Standard_API int Printf (const char* theFormat, ...);
Standard_EXPORT int Printf (const char* theFormat, ...);
//! Equivalent of standard C function fprintf() that always uses C locale
__Standard_API int Fprintf (FILE* theFile, const char* theFormat, ...);
Standard_EXPORT int Fprintf (FILE* theFile, const char* theFormat, ...);
//! Equivalent of standard C function sprintf() that always uses C locale
__Standard_API int Sprintf (char* theBuffer, const char* theFormat, ...);
Standard_EXPORT int Sprintf (char* theBuffer, const char* theFormat, ...);
#ifdef __cplusplus
}

2
src/Standard/Standard_ExtString.hxx
View File

@ -27,6 +27,6 @@
//============================================================================
//==== HashCode : Returns a HashCode ExtString
//============================================================================
__Standard_API Standard_Integer HashCode (const Standard_ExtString, const Standard_Integer);
Standard_EXPORT Standard_Integer HashCode (const Standard_ExtString, const Standard_Integer);
#endif

19
src/Standard/Standard_Macro.hxx
View File

@ -168,8 +168,11 @@
//! This macro should be used in declarations of public methods
//! to ensure that they are exported from DLL on Windows and thus
//! can be called from other (dependent) libraries or applications.
//!
//! If macro OCCT_STATIC_BUILD is defined, then Standard_EXPORT
//! is set to empty.
# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# if defined(_WIN32) && !defined(OCCT_STATIC_BUILD) && !defined(HAVE_NO_DLL)
//======================================================
// Windows-specific definitions
@ -218,20 +221,6 @@
# endif /* _WIN32 */
//======================================================
// Other
//======================================================
# ifndef __Standard_API
# if !defined(_WIN32) || defined(__Standard_DLL) || defined(__FSD_DLL) || defined(__MMgt_DLL) || defined(__OSD_DLL) || defined(__Plugin_DLL) || defined(__Quantity_DLL) || defined(__Resource_DLL) || defined(__SortTools_DLL) || defined(__StdFail_DLL) || defined(__Storage_DLL) || defined(__TColStd_DLL) || defined(__TCollection_DLL) || defined(__TShort_DLL) || defined(__Units_DLL) || defined(__UnitsAPI_DLL) || defined(__Dico_DLL)
# define __Standard_API Standard_EXPORT
# define __Standard_APIEXTERN Standard_EXPORTEXTERN
# else
# define __Standard_API Standard_IMPORT
# define __Standard_APIEXTERN Standard_IMPORT
# endif // __Standard_DLL
# endif // __Standard_API
//! @def OCCT_UWP
//! This macro is defined on Windows platform in the case if the code
//! is being compiled for UWP (Universal Windows Platform).

26
src/Standard/Standard_Real.hxx
View File

@ -30,23 +30,23 @@
// ==================================
// Methods implemeted in Standard_Real.cxx
// ==================================
__Standard_API Standard_Integer HashCode (const Standard_Real, const Standard_Integer);
Standard_EXPORT Standard_Integer HashCode (const Standard_Real, const Standard_Integer);
__Standard_API Standard_Real ACos (const Standard_Real );
__Standard_API Standard_Real ACosApprox (const Standard_Real );
__Standard_API Standard_Real ASin (const Standard_Real );
__Standard_API Standard_Real ATan2 (const Standard_Real , const Standard_Real );
__Standard_API Standard_Real NextAfter (const Standard_Real , const Standard_Real );
Standard_EXPORT Standard_Real ACos (const Standard_Real );
Standard_EXPORT Standard_Real ACosApprox (const Standard_Real );
Standard_EXPORT Standard_Real ASin (const Standard_Real );
Standard_EXPORT Standard_Real ATan2 (const Standard_Real , const Standard_Real );
Standard_EXPORT Standard_Real NextAfter (const Standard_Real , const Standard_Real );
//! Returns |a| if b >= 0; -|a| if b < 0.
__Standard_API Standard_Real Sign(const Standard_Real a, const Standard_Real b);
Standard_EXPORT Standard_Real Sign(const Standard_Real a, const Standard_Real b);
__Standard_API Standard_Real ATanh (const Standard_Real );
__Standard_API Standard_Real ACosh (const Standard_Real );
__Standard_API Standard_Real Sinh (const Standard_Real );
__Standard_API Standard_Real Cosh (const Standard_Real );
__Standard_API Standard_Real Log (const Standard_Real );
__Standard_API Standard_Real Sqrt (const Standard_Real );
Standard_EXPORT Standard_Real ATanh (const Standard_Real );
Standard_EXPORT Standard_Real ACosh (const Standard_Real );
Standard_EXPORT Standard_Real Sinh (const Standard_Real );
Standard_EXPORT Standard_Real Cosh (const Standard_Real );
Standard_EXPORT Standard_Real Log (const Standard_Real );
Standard_EXPORT Standard_Real Sqrt (const Standard_Real );
//-------------------------------------------------------------------
// RealSmall : Returns the smallest positive real

2
src/Standard/Standard_ShortReal.hxx
View File

@ -138,7 +138,7 @@ inline Standard_ShortReal Min (const Standard_ShortReal Val1,
// ==================================
// Methods implemeted in Standard_ShortReal.cxx
// ==================================
__Standard_API Standard_Integer HashCode (const Standard_ShortReal, const Standard_Integer);
Standard_EXPORT Standard_Integer HashCode (const Standard_ShortReal, const Standard_Integer);
//-------------------------------------------------------------------
// IsEqual : Returns Standard_True if two ShortReals are equal

6
src/Standard/Standard_math.hxx
View File

@ -26,9 +26,9 @@
// MSVC versions prior to 12 did not provided acosh, asinh, atanh functions in standard library
#if _MSC_VER < 1800
__Standard_API double __cdecl acosh ( double );
__Standard_API double __cdecl asinh ( double );
__Standard_API double __cdecl atanh ( double );
Standard_EXPORT double __cdecl acosh ( double );
Standard_EXPORT double __cdecl asinh ( double );
Standard_EXPORT double __cdecl atanh ( double );
#endif
#endif /* _MSC_VER */

12
src/StdLPersistent/StdLPersistent_Collection.cxx
View File

@ -68,18 +68,6 @@ private:
Handle(TDF_Data) myDF;
};
//=======================================================================
//function : Read
//purpose : Read persistent data from a file
//=======================================================================
template <class Base>
void StdLPersistent_Collection::booleanArrayBase<Base>::Read
(StdObjMgt_ReadData& theReadData)
{
Base::Read (theReadData);
theReadData >> myLower >> myUpper;
}
template <class Base>
template <class ArrayHandle, class Converter>
void StdLPersistent_Collection::booleanArrayBase<Base>::import

6
src/StdLPersistent/StdLPersistent_Collection.hxx
View File

@ -47,7 +47,11 @@ class StdLPersistent_Collection
{
public:
//! Read persistent data from a file.
Standard_EXPORT virtual void Read (StdObjMgt_ReadData& theReadData);
virtual void Read (StdObjMgt_ReadData& theReadData)
{
Base::Read (theReadData);
theReadData >> myLower >> myUpper;
}
protected:
template <class ArrayHandle, class Converter>

4
src/StdStorage/StdStorage_MapOfTypes.hxx
View File

@ -14,8 +14,8 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef Storage_PType_HeaderFile
#define Storage_PType_HeaderFile
#ifndef Storage_MapOfTypes_HeaderFile
#define Storage_MapOfTypes_HeaderFile
#include <TCollection_AsciiString.hxx>
#include <Standard_Integer.hxx>

2
src/Storage/FILES
View File

@ -39,8 +39,6 @@ Storage_Schema.hxx
Storage_Schema.lxx
Storage_SeqOfRoot.hxx
Storage_SolveMode.hxx
Storage_stCONSTclCOM.cxx
Storage_stCONSTclCOM.hxx
Storage_StreamExtCharParityError.hxx
Storage_StreamFormatError.hxx
Storage_StreamModeError.hxx

13
src/Storage/Storage_stCONSTclCOM.cxx
View File

@ -1,13 +0,0 @@
// Copyright (c) 1998-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.

57
src/Storage/Storage_stCONSTclCOM.hxx
View File

@ -1,57 +0,0 @@
// Created on: 1997-01-30
// Created by: Christophe LEYNADIER
// Copyright (c) 1997-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _Storage_stCONSTclCOM_HeaderFile
#define _Storage_stCONSTclCOM_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
class Storage_stCONSTclCOM
{
public:
DEFINE_STANDARD_ALLOC
protected:
private:
};
#endif // _Storage_stCONSTclCOM_HeaderFile

1
src/TNaming/FILES
View File

@ -49,7 +49,6 @@ TNaming_PtrNode.hxx
TNaming_PtrRefShape.hxx
TNaming_RefShape.hxx
TNaming_RefShape.lxx
TNaming_SameShapeIterator.cxx
TNaming_SameShapeIterator.hxx
TNaming_SameShapeIterator.lxx
TNaming_Scope.cxx

26
src/TNaming/TNaming_SameShapeIterator.cxx
View File

@ -1,26 +0,0 @@
// Created on: 1997-04-28
// Created by: Yves FRICAUD
// Copyright (c) 1997-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <Standard_NoMoreObject.hxx>
#include <Standard_NoSuchObject.hxx>
#include <TDF_Label.hxx>
#include <TNaming_SameShapeIterator.hxx>
#include <TNaming_Tool.hxx>
#include <TNaming_UsedShapes.hxx>
#include <TopoDS_Shape.hxx>
// See methods'body in TNaming_NamedShape.cxx

2
src/TopClass/FILES
View File

@ -5,8 +5,6 @@ TopClass_Classifier3d.gxx
TopClass_Classifier3d.lxx
TopClass_FaceClassifier.gxx
TopClass_FaceClassifier.lxx
TopClass_Intersection3d.cxx
TopClass_Intersection3d.hxx
TopClass_SolidClassifier.gxx
TopClass_SolidExplorer.cxx
TopClass_SolidExplorer.hxx

15
src/TopClass/TopClass_Intersection3d.cxx
View File

@ -1,15 +0,0 @@
// Created on: 1996-10-23
// Created by: Laurent BUCHARD
// Copyright (c) 1995-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.

99
src/TopClass/TopClass_Intersection3d.hxx
View File

@ -1,99 +0,0 @@
// Created on: 1994-03-30
// Created by: Laurent BUCHARD
// Copyright (c) 1994-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _TopClass_Intersection3d_HeaderFile
#define _TopClass_Intersection3d_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
#include <TopAbs_State.hxx>
class gp_Lin;
class TopoDS_Face;
class IntCurveSurface_IntersectionPoint;
//! Template class for the intersection algorithm required
//! by the 3D classifications.
//!
//! (a intersection point near the origin of the line, ie.
//! at a distance less or equal than <tolerance>, will be
//! returned even if it has a negative parameter.)
class TopClass_Intersection3d
{
public:
DEFINE_STANDARD_ALLOC
//! Perform the intersection between the
//! segment L(0) ... L(Prm) and the Face <Face>.
//!
//! Only the point with the smallest parameter on the
//! line is returned.
//!
//! The Tolerance <Tol> is used to determine if the
//! first point of the segment is near the face. In
//! that case, the parameter of the intersection point
//! on the line can be a negative value (greater than -Tol).
Standard_EXPORT virtual void Perform (const gp_Lin& L, const Standard_Real Prm, const Standard_Real Tol, const TopoDS_Face& Face) = 0;
//! True is returned when the intersection have been computed.
Standard_EXPORT virtual Standard_Boolean IsDone() const = 0;
//! True is returned if a point has been found.
Standard_EXPORT virtual Standard_Boolean HasAPoint() const = 0;
//! Returns the Intersection Point.
Standard_EXPORT virtual const IntCurveSurface_IntersectionPoint& Point() const = 0;
//! Returns the state of the point on the face.
//! The values can be either TopAbs_IN
//! ( the point is in the face)
//! or TopAbs_ON
//! ( the point is on a boudary of the face).
Standard_EXPORT virtual TopAbs_State State() const = 0;
protected:
//! Empty constructor.
Standard_EXPORT TopClass_Intersection3d();
private:
};
#endif // _TopClass_Intersection3d_HeaderFile

32
src/math/math_Recipes.hxx
View File

@ -19,18 +19,6 @@
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
#ifndef __math_API
# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __math_DLL
# define __math_API __declspec( dllexport )
# else
# define __math_API __declspec( dllimport )
# endif /* __math_DLL */
# else
# define __math_API
# endif /* _WIN32 */
#endif /* __math_API */
class math_IntegerVector;
class math_Vector;
class math_Matrix;
@ -41,7 +29,7 @@ const Standard_Integer math_Status_SingularMatrix = 1;
const Standard_Integer math_Status_ArgumentError = 2;
const Standard_Integer math_Status_NoConvergence = 3;
__math_API Standard_Integer LU_Decompose(math_Matrix& a,
Standard_EXPORT Standard_Integer LU_Decompose(math_Matrix& a,
math_IntegerVector& indx,
Standard_Real& d,
Standard_Real TINY = 1.0e-20);
@ -52,7 +40,7 @@ __math_API Standard_Integer LU_Decompose(math_Matrix& a,
// pivoting; d is output as +1 or -1 depending on wether the number of row
// interchanges was even or odd.
__math_API Standard_Integer LU_Decompose(math_Matrix& a,
Standard_EXPORT Standard_Integer LU_Decompose(math_Matrix& a,
math_IntegerVector& indx,
Standard_Real& d,
math_Vector& vv,
@ -62,7 +50,7 @@ __math_API Standard_Integer LU_Decompose(math_Matrix& a,
// used internally as a scratch area.
__math_API void LU_Solve(const math_Matrix& a,
Standard_EXPORT void LU_Solve(const math_Matrix& a,
const math_IntegerVector& indx,
math_Vector& b);
@ -73,13 +61,13 @@ __math_API void LU_Solve(const math_Matrix& a,
// the routine may be called sequentially with different b's.
__math_API Standard_Integer LU_Invert(math_Matrix& a);
Standard_EXPORT Standard_Integer LU_Invert(math_Matrix& a);
// Given a matrix a(1..n, 1..n) this routine computes its inverse. The matrix
// a is replaced by its inverse.
__math_API Standard_Integer SVD_Decompose(math_Matrix& a,
Standard_EXPORT Standard_Integer SVD_Decompose(math_Matrix& a,
math_Vector& w,
math_Matrix& v);
@ -91,7 +79,7 @@ __math_API Standard_Integer SVD_Decompose(math_Matrix& a,
// zero rows.
__math_API Standard_Integer SVD_Decompose(math_Matrix& a,
Standard_EXPORT Standard_Integer SVD_Decompose(math_Matrix& a,
math_Vector& w,
math_Matrix& v,
math_Vector& rv1);
@ -101,7 +89,7 @@ __math_API Standard_Integer SVD_Decompose(math_Matrix& a,
// (the number of rows a(1..m, 1..n)) is used internally as a scratch area.
__math_API void SVD_Solve(const math_Matrix& u,
Standard_EXPORT void SVD_Solve(const math_Matrix& u,
const math_Vector& w,
const math_Matrix& v,
const math_Vector& b,
@ -116,7 +104,7 @@ __math_API void SVD_Solve(const math_Matrix& u,
__math_API Standard_Integer DACTCL_Decompose(math_Vector& a, const math_IntegerVector& indx,
Standard_EXPORT Standard_Integer DACTCL_Decompose(math_Vector& a, const math_IntegerVector& indx,
const Standard_Real MinPivot = 1.e-20);
// Given a SYMMETRIC matrix a, this routine computes its
@ -130,7 +118,7 @@ __math_API Standard_Integer DACTCL_Decompose(math_Vector& a, const math_IntegerV
__math_API Standard_Integer DACTCL_Solve(const math_Vector& a, math_Vector& b,
Standard_EXPORT Standard_Integer DACTCL_Solve(const math_Vector& a, math_Vector& b,
const math_IntegerVector& indx,
const Standard_Real MinPivot = 1.e-20);
@ -141,7 +129,7 @@ __math_API Standard_Integer DACTCL_Solve(const math_Vector& a, math_Vector& b,
__math_API Standard_Integer Jacobi(math_Matrix& a, math_Vector& d, math_Matrix& v, Standard_Integer& nrot);
Standard_EXPORT Standard_Integer Jacobi(math_Matrix& a, math_Vector& d, math_Matrix& v, Standard_Integer& nrot);
// Computes all eigenvalues and eigenvectors of a real symmetric matrix
// a(1..n, 1..n). On output, elements of a above the diagonal are destroyed.