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
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
Andrey Pavlenko
f177e65871
Merge pull request #1683 from alalek:ocl_restore_showdiff
11 years ago
Roman Donchenko
3b08bf6b62
Merge pull request #1682 from SpecLad:Wmissing-declarations
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
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
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
Andrey Pavlenko
4cf598a862
Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder
11 years ago
Alexander Alekhin
133d889e33
ocl: show diff
11 years ago
Ilya Lavrenov
5864895ec6
fixed ocl::copyMakeBorder
11 years ago
Ilya Lavrenov
7c1443cbdd
fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0)
11 years ago
Alexander Alekhin
d571b28eaa
cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory
11 years ago
Ilya Lavrenov
29499ed51a
moved to relative errors in ocl::norm tests
11 years ago
Ilya Lavrenov
87fc3441f2
workaround for cv::multiply bug
11 years ago
Roman Donchenko
6dda2652cd
Merge pull request #1659 from ilya-lavrenov:ocl_examples
11 years ago
Roman Donchenko
bb461fab34
Merge pull request #1649 from asandwhich:2.4
11 years ago
Roman Donchenko
a549621aac
Merge pull request #1666 from SpecLad:cv-cap-openni
11 years ago
Roman Donchenko
f82eb0f79c
Add better OpenMP detection and make an option to enable it.
...
Bug report and inspiration: http://code.opencv.org/issues/3328
11 years ago
Roman Donchenko
8ff267cbac
Fixed incorrectly unprefixed constant names in the OpenNI tutorial.
...
Bug report: http://code.opencv.org/issues/3329
11 years ago
Andrey Pavlenko
1e8b72f8c0
Merge pull request #1658 from alalek:ocl_fixes
11 years ago
Ilya Lavrenov
4d86e2140d
OpenCL examples refactoring
11 years ago
Alexander Alekhin
e7fd053478
ocl: fix FFT initialization
11 years ago
Alexander Alekhin
9acca12d2d
ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error
11 years ago
Greg Hale
387587f4f0
regex doesnt need to match full length of input, so only trying to match the leading -[lL]
11 years ago
Roman Donchenko
a54d36bde8
Merge pull request #1646 from alalek:ocl_fix_msvc11
11 years ago
Roman Donchenko
bfd8acbbc3
Merge pull request #1556 from jet47:fix-bug-3296
11 years ago