Roman Donchenko
03bbee327b
Merge pull request #1486 from nzjrs:cv2-logpolar
11 years ago
Roman Donchenko
f68b73f831
Merge pull request #1521 from nailbiter:optimCG
11 years ago
Roman Donchenko
334292083e
Merge pull request #1629 from lluisgomez:er_tree_clean_bug_fix
11 years ago
Roman Donchenko
75087580de
Merge pull request #1704 from SpecLad:merge-2.4
11 years ago
Andrey Pavlenko
616db74e49
Merge pull request #1663 from vpisarev:ocl_experiments3
11 years ago
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
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
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
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
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
Vadim Pisarevsky
b1aa4a4913
yet another attempt to fix test failures
11 years ago
Vadim Pisarevsky
e14171fd33
fixed crash in Python bindings
11 years ago
Roman Donchenko
7e1ded0ebd
Merge pull request #1664 from SpecLad:merge-2.4
11 years ago
Vadim Pisarevsky
a9065b7d0c
trying to fix failures in tests
11 years ago
Vadim Pisarevsky
303df78cca
removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now
11 years ago
Roman Donchenko
f0bc253d0e
Merge pull request #1667 from SpecLad:detect-openmp
11 years ago
Roman Donchenko
119cdc57e9
Merge pull request #1623 from ImAlsoGreg:2.4-pkgconfig-dash-l
11 years ago
Roman Donchenko
dfe07df87b
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.
11 years ago
Ilya Lavrenov
dab3000778
fixed bug in ocl::equalizeHist
11 years ago
Roman Donchenko
c7408003d2
Merge pull request #1678 from wejeus:ios-documentationfix-2.4
11 years ago
Roman Donchenko
f5bd8fecc9
Merge pull request #1674 from alalek:cmake_fix
11 years ago
Samuel Wejéus
eddaaa9643
Removed incorrect release of obtained colorspace. This fixes bug #3318 (updated commit for 2.4 branch)
11 years ago
Andrey Pavlenko
2279c209c8
Merge pull request #1676 from ilya-lavrenov:ocl_resize_test
11 years ago
Andrey Pavlenko
931a2ae14f
Merge pull request #1673 from ilya-lavrenov:ocl_norm
11 years ago
Andrey Pavlenko
e7f39eb46e
Merge pull request #1672 from ilya-lavrenov:ocl_arithm
11 years ago