• G
    Merge pull request #9856 from GregoryMorse:patch-1 · d30a0c6f
    Gregory Morse 提交于
    * Update OpenCVCompilerOptimizations.cmake
    
    Neon not supported on MSVC ARM breaking build fix
    
    * Update OpenCVCompilerOptimizations.cmake
    
    Whitespace
    
    * Update intrin.hpp
    
    Many problems in MSVC ARM builds (at least on VS2017) being fixed in this PR now.
    
    C:\Users\Gregory\DOCUME~1\MYLIBR~1\OPENCV~3\opencv\sources\modules\core\include\opencv2/core/hal/intrin.hpp(444): error C3861: '_tzcnt_u32': identifier not found
    
    * Update hal_replacement.hpp
    
    Passing variadic expansion in a macro to another macro does not work properly in MSVC and a famous known workaround is hereby applied.  Discussion of it: https://stackoverflow.com/questions/5134523/msvc-doesnt-expand-va-args-correctly
    Only needed the fix for ARM builds: TEGRA_ macros are used for cv_hal_ functions in the carotene library.
    
    C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): warning C4003: not enough actual parameters for macro 'TEGRA_ADD'
    C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2143: syntax error: missing ')' before ','
    C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2059: syntax error: ')'
    
    * Update hal_replacement.hpp
    
    All hal_replacement's using carotene\hal\tegra_hal.hpp TEGRA_ functions as macros preprocessed by variadic macros should be changed, identical as was done in core.
    C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): warning C4003: not enough actual parameters for macro 'TEGRA_CVTBGRTOBGR'
    C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): error C2059: syntax error: '=='
    
    * Update OpenCVCompilerOptimizations.cmake
    
    * Update hal_replacement.hpp
    
    * Update hal_replacement.hpp
    d30a0c6f
OpenCVCompilerOptimizations.cmake 29.6 KB