mirror of
https://github.com/opencv/opencv.git
synced 2026-07-25 05:13:04 +04:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| af32659937 | |||
| 02a74f2e88 | |||
| 843c09bcb0 | |||
| 1c664ff673 | |||
| d5ef86c9a4 | |||
| 3c73557dac | |||
| 565bc3aeed | |||
| 258b062295 |
@@ -9,9 +9,6 @@ jobs:
|
||||
Ubuntu2004-ARM64:
|
||||
uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-ARM64.yaml@main
|
||||
|
||||
Ubuntu1404-x64:
|
||||
uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-U14.yaml@main
|
||||
|
||||
Ubuntu2004-x64:
|
||||
uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-U20.yaml@main
|
||||
|
||||
|
||||
Vendored
+10
-9
@@ -2,9 +2,10 @@ function(download_ippicv root_var)
|
||||
set(${root_var} "" PARENT_SCOPE)
|
||||
|
||||
# Commit SHA in the opencv_3rdparty repo
|
||||
set(IPPICV_COMMIT "0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a")
|
||||
set(IPPICV_COMMIT "fd27188235d85e552de31425e7ea0f53ba73ba53")
|
||||
# Define actual ICV versions
|
||||
if(APPLE)
|
||||
set(IPPICV_COMMIT "0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a")
|
||||
set(OPENCV_ICV_PLATFORM "macosx")
|
||||
set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_mac")
|
||||
set(OPENCV_ICV_NAME "ippicv_2021.9.1_mac_intel64_20230919_general.tgz")
|
||||
@@ -13,21 +14,21 @@ function(download_ippicv root_var)
|
||||
set(OPENCV_ICV_PLATFORM "linux")
|
||||
set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_lnx")
|
||||
if(X86_64)
|
||||
set(OPENCV_ICV_NAME "ippicv_2021.10.0_lnx_intel64_20230919_general.tgz")
|
||||
set(OPENCV_ICV_HASH "606a19b207ebedfe42d59fd916cc4850")
|
||||
set(OPENCV_ICV_NAME "ippicv_2021.11.0_lnx_intel64_20240201_general.tgz")
|
||||
set(OPENCV_ICV_HASH "0f2745ff705ecae31176dad437608f6f")
|
||||
else()
|
||||
set(OPENCV_ICV_NAME "ippicv_2021.10.0_lnx_ia32_20230919_general.tgz")
|
||||
set(OPENCV_ICV_HASH "ea08487b810baad2f68aca87b74a2db9")
|
||||
set(OPENCV_ICV_NAME "ippicv_2021.11.0_lnx_ia32_20240201_general.tgz")
|
||||
set(OPENCV_ICV_HASH "63e381bf08076ca34fd5264203043a45")
|
||||
endif()
|
||||
elseif(WIN32 AND NOT ARM)
|
||||
set(OPENCV_ICV_PLATFORM "windows")
|
||||
set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_win")
|
||||
if(X86_64)
|
||||
set(OPENCV_ICV_NAME "ippicv_2021.10.0_win_intel64_20230919_general.zip")
|
||||
set(OPENCV_ICV_HASH "538a819ec84193a9c9f3c0f8df0be8b7")
|
||||
set(OPENCV_ICV_NAME "ippicv_2021.11.0_win_intel64_20240201_general.zip")
|
||||
set(OPENCV_ICV_HASH "59d154bf54a1e3eea20d7248f81a2a8e")
|
||||
else()
|
||||
set(OPENCV_ICV_NAME "ippicv_2021.10.0_win_ia32_20230919_general.zip")
|
||||
set(OPENCV_ICV_HASH "8ff93c69415ab0835cc1e94dc5660f5d")
|
||||
set(OPENCV_ICV_NAME "ippicv_2021.11.0_win_ia32_20240201_general.zip")
|
||||
set(OPENCV_ICV_HASH "7a6d8ac5825c02fea6cbfc1201b521b5")
|
||||
endif()
|
||||
else()
|
||||
return()
|
||||
|
||||
@@ -2360,7 +2360,7 @@ W
|
||||
x \\
|
||||
y \\
|
||||
\texttt{disparity} (x,y) \\
|
||||
z
|
||||
1
|
||||
\end{bmatrix}.\f]
|
||||
|
||||
@sa
|
||||
|
||||
@@ -391,7 +391,7 @@ namespace cv { namespace cuda { namespace device
|
||||
//cudaSafeCall( cudaFuncSetCacheConfig(&stereoKernel, cudaFuncCachePreferShared) );
|
||||
|
||||
cudaSafeCall( cudaMemset2D(disp.data, disp.step, 0, disp.cols, disp.rows) );
|
||||
cudaSafeCall( cudaMemset2D(minSSD_buf.data, minSSD_buf.step, 0xFF, minSSD_buf.cols * minSSD_buf.elemSize(), disp.rows) );
|
||||
cudaSafeCall( cudaMemset2D(minSSD_buf.data, minSSD_buf.step, 0xFF, minSSD_buf.cols * minSSD_buf.elemSize(), minSSD_buf.rows) );
|
||||
|
||||
cudaSafeCall( cudaMemcpyToSymbol( cwidth, &left.cols, sizeof(left.cols) ) );
|
||||
cudaSafeCall( cudaMemcpyToSymbol( cheight, &left.rows, sizeof(left.rows) ) );
|
||||
|
||||
Reference in New Issue
Block a user