potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #5784 from alalek:distrib_fix

Browse Source
This commit is contained in:
Maksim Shabunin
2015-12-15 12:24:36 +00:00
parent 1e443a6ea6 2bfad68812
commit 574280cd3a
10 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/dxt.cpp
+1 -1
View File
@@ -2215,7 +2215,7 @@ class PlanCache
clAmdFftDim dim = dft_size.height == 1 || dft_rows ? CLFFT_1D : CLFFT_2D;
size_t batchSize = dft_rows ? dft_size.height : 1;
size_t clLengthsIn[3] = { dft_size.width, dft_rows ? 1 : dft_size.height, 1 };
size_t clLengthsIn[3] = { (size_t)dft_size.width, dft_rows ? 1 : (size_t)dft_size.height, 1 };
size_t clStridesIn[3] = { 1, 1, 1 };
size_t clStridesOut[3] = { 1, 1, 1 };
int elemSize = doubleFP ? sizeof(double) : sizeof(float);
modules/ts/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
set(the_description "The ts module")
if(IOS)
if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS)
ocv_module_disable(ts)
endif()