Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
11 years ago
yao
0fd872bfa9
fix bug #1480
11 years ago
yao
632452cdd8
fix the mismatch running on cpu devices
11 years ago
Roman Donchenko
88f5ef9acc
Merge pull request #1696 from apavlenko:fix_typo_GpuMaterials
11 years ago
Peng Xiao
ab2bd58f5c
Fixed a missing barrier.
11 years ago
Vladislav Vinogradov
06c1f9a329
added own version of FindCUDA.cmake
11 years ago
konstantin
973137c78e
fix bugs on host and device sides for imgprog_sobel3.cl
11 years ago
Alexander Alekhin
eb4f50ca59
ocl: Canny: port CUDA-based implementation of edgesHysteresisLocal
11 years ago
Ilya Lavrenov
900c303636
added performance tests for ocl::bitwise_or and ocl::bitwose_xor
11 years ago
Alexander Alekhin
9e527fc9f4
ocl: Canny: replace unsafe buffer to oclMat
11 years ago
Ilya Lavrenov
839245e420
fixed tests for ocl::warpAffine and ocl::warpPerspective
11 years ago
konstantin
ddd2b106fb
rename imageproc_sobel2.cl -> imageproc_sobel3.cl for consistency
11 years ago
Roman Donchenko
c1223f8dac
Merge pull request #1697 from SpecLad:sdk-redux
11 years ago
Andrey Pavlenko
66e5be2d64
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
11 years ago
Andrey Pavlenko
fc64a4071c
Merge pull request #1689 from ilya-lavrenov:ocl_bilateralFilter
11 years ago
Andrey Pavlenko
4e57f92e6e
Merge pull request #1692 from ilya-lavrenov:ocl_separableFilter
11 years ago
Andrey Pavlenko
d60924f4f2
Merge pull request #1694 from apavlenko:fix_typo
11 years ago
Andrey Pavlenko
92c43a8646
Merge pull request #1693 from ilya-lavrenov:ocl_adaptiveBilateralFilter
11 years ago
Roman Donchenko
90f8906e1e
Merge pull request #1690 from SpecLad:cmake-2.8.12
11 years ago
Roman Donchenko
c016c43d25
Fixed Android SDK build - again.
11 years ago
Andrey Pavlenko
2e5db6e56c
fixing typo
11 years ago
Andrey Pavlenko
2b6fca68bf
fixing typo
11 years ago
Roman Donchenko
55ede74022
Merge pull request #1680 from alalek:cmake_fix_android_builds
11 years ago
Ilya Lavrenov
e1596d69cc
fixed extrapolation in ocl::adaptiveBilateralFilter
11 years ago
Alexander Alekhin
7a8f9fe746
cmake: fix android installation for different NDK ABIs
11 years ago
Ilya Lavrenov
b33a62beb0
fixed separable filter extrapolation
11 years ago
Vadim Pisarevsky
485d36d3c0
changed InputArray's enumeration constant for UMat, since it may potentially conflict with existing OpenCL module. refactored Kernel's setArg API (now UMat is passed to a kernel as a structure, as Alexander A suggested). removed Kernel's cleanup callback from the external API; now each kernel keeps track of used matrices and they are dereferenced after it's complete.
11 years ago
Roman Donchenko
36b5180aa1
Another FFmpeg fix from master.
...
From commit dd74a851
, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.
Also modified some gpu sources in a similar manner.
11 years ago
peng xiao
68a8a11161
Rewrite distanceToCenters.
...
It supports NORM_L1 distance types now and can
use user provided indices.
Also fixed a bug of kmeans where distance pointers should be float instead
of double.
NORM_L2 changed to NORM_L2SQR, Accuracy and Perf tests are added
added ROI support in accuracy test of distanceToCenters
11 years ago
Roman Donchenko
1188894133
Fixed indentation in CV_FFmpegWriteBigVideoTest::run.
11 years ago
Roman Donchenko
2ca49eef37
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
(cherry picked from commit dfe07df87b
)
11 years ago
Roman Donchenko
5a5d569d72
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
(cherry picked from commit 424a7b0ab0
)
Conflicts:
modules/highgui/test/test_ffmpeg.cpp
11 years ago
Roman Donchenko
260c2e0b08
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
(cherry picked from commit 3f3ae33327
)
11 years ago
Roman Donchenko
d3af86c0ea
Added the missing setting of HAVE_FFMPEG to true on Windows.
...
While the FFmpeg video IO backend gets compiled even without it,
the tests (for both FFmpeg and video IO) don't. This should fix
that.
11 years ago
Roman Donchenko
76b904b022
Replaced our usage of LINK_PRIVATE with that of LINK_INTERFACE_LIBRARIES.
...
The reasons for that are twofold:
1) LINK_PRIVATE is only available since CMake 2.8.7.
2) The way it was used generated a warning because of CMake policy CMP0023:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0023
Using LINK_INTERFACE_LIBRARIES actually causes another warning - this time
because of CMake policy CMP0022:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0022
I set the policy to OLD, because NEW means subtle changes when compiling
with CMake 2.8.12, and I don't want to research that this close to release.
:-)
I also removed the setting of CMP0003, because it's set by
cmake_minimal_version anyway.
11 years ago
Roman Donchenko
e1c8f5d723
Removed a stray comma in the Android toolchain file.
...
It was actually acting as an additional argument, breaking the error message.
11 years ago
Ilya Lavrenov
9ea6001d08
enabled ocl::bilateralFilter ROI testing
11 years ago
Roman Donchenko
31f0ab6c80
Merge pull request #1681 from LeszekSwirski:fix-ninjabuild
11 years ago
Andrey Pavlenko
f177e65871
Merge pull request #1683 from alalek:ocl_restore_showdiff
11 years ago
yao
dd0fa63ca8
fix the bug of ocl::bruteForceMatcher
11 years ago
Vadim Pisarevsky
6416c33020
fixed some bugs in OpenCL branch of UMat implementation; maybe now the tests will finally pass?! (please ;( )
11 years ago
Vadim Pisarevsky
ace0d4bad0
hopefully, the last test failures are fixed now
11 years ago
Vadim Pisarevsky
5920bd4f2e
fixed whitespace errors
11 years ago
Vadim Pisarevsky
caa33b2242
added first very simple test for UMat<=>Mat conversion
11 years ago
Roman Donchenko
3b08bf6b62
Merge pull request #1682 from SpecLad:Wmissing-declarations
11 years ago
Leszek Swirski
6e4fb8f275
Replace $(Configuration) with $<CONFIGURATION>
11 years ago
Roman Donchenko
496859a944
Merge pull request #1643 from alalek:cmake_fix_java_link_rules
11 years ago
Roman Donchenko
7804240528
Merge pull request #1679 from ilya-lavrenov:ocl_equalizeHist
11 years ago
Alexander Alekhin
4b17d073c0
cmake: fix linker dependencies for opencv_java
...
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
11 years ago
Roman Donchenko
f51e490bad
Fixed a Wmissing-declarations warning when compiling with MinGW.
11 years ago