• Gregory Morse's avatar
    Merge pull request #9856 from GregoryMorse:patch-1 · d30a0c6f
    Gregory Morse authored
    * 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
Name
Last commit
Last update
..
FindCUDA Loading commit data...
checks Loading commit data...
templates Loading commit data...
FindCUDA.cmake Loading commit data...
FindGstreamerWindows.cmake Loading commit data...
FindOpenVX.cmake Loading commit data...
FindPylint.cmake Loading commit data...
OpenCVCRTLinkage.cmake Loading commit data...
OpenCVCompilerDefenses.cmake Loading commit data...
OpenCVCompilerOptimizations.cmake Loading commit data...
OpenCVCompilerOptions.cmake Loading commit data...
OpenCVDetectAndroidSDK.cmake Loading commit data...
OpenCVDetectApacheAnt.cmake Loading commit data...
OpenCVDetectCStripes.cmake Loading commit data...
OpenCVDetectCUDA.cmake Loading commit data...
OpenCVDetectCXXCompiler.cmake Loading commit data...
OpenCVDetectDirectX.cmake Loading commit data...
OpenCVDetectHalide.cmake Loading commit data...
OpenCVDetectMediaSDK.cmake Loading commit data...
OpenCVDetectOpenCL.cmake Loading commit data...
OpenCVDetectPython.cmake Loading commit data...
OpenCVDetectTBB.cmake Loading commit data...
OpenCVDetectTrace.cmake Loading commit data...
OpenCVDetectVTK.cmake Loading commit data...
OpenCVDownload.cmake Loading commit data...
OpenCVExtraTargets.cmake Loading commit data...
OpenCVFindAtlas.cmake Loading commit data...
OpenCVFindIPP.cmake Loading commit data...
OpenCVFindIPPAsync.cmake Loading commit data...
OpenCVFindIPPIW.cmake Loading commit data...
OpenCVFindIntelPerCSDK.cmake Loading commit data...
OpenCVFindLAPACK.cmake Loading commit data...
OpenCVFindLATEX.cmake Loading commit data...
OpenCVFindLibProtobuf.cmake Loading commit data...
OpenCVFindLibsGUI.cmake Loading commit data...
OpenCVFindLibsGrfmt.cmake Loading commit data...
OpenCVFindLibsPerf.cmake Loading commit data...
OpenCVFindLibsVideo.cmake Loading commit data...
OpenCVFindMKL.cmake Loading commit data...
OpenCVFindMatlab.cmake Loading commit data...
OpenCVFindOpenBLAS.cmake Loading commit data...
OpenCVFindOpenEXR.cmake Loading commit data...
OpenCVFindOpenNI.cmake Loading commit data...
OpenCVFindOpenNI2.cmake Loading commit data...
OpenCVFindVA.cmake Loading commit data...
OpenCVFindVA_INTEL.cmake Loading commit data...
OpenCVFindWebP.cmake Loading commit data...
OpenCVFindXimea.cmake Loading commit data...
OpenCVGenABI.cmake Loading commit data...
OpenCVGenAndroidMK.cmake Loading commit data...
OpenCVGenConfig.cmake Loading commit data...
OpenCVGenHeaders.cmake Loading commit data...
OpenCVGenInfoPlist.cmake Loading commit data...
OpenCVGenPkgconfig.cmake Loading commit data...
OpenCVMinDepVersions.cmake Loading commit data...
OpenCVModule.cmake Loading commit data...
OpenCVPCHSupport.cmake Loading commit data...
OpenCVPackaging.cmake Loading commit data...
OpenCVPylint.cmake Loading commit data...
OpenCVUtils.cmake Loading commit data...
OpenCVVersion.cmake Loading commit data...
cl2cpp.cmake Loading commit data...
copyAndroidLibs.cmake Loading commit data...