Roman Donchenko [Tue, 29 Oct 2013 12:14:29 +0000 (16:14 +0400)]
Merge pull request #1521 from nailbiter:optimCG
Roman Donchenko [Tue, 29 Oct 2013 12:03:49 +0000 (16:03 +0400)]
Merge pull request #1629 from lluisgomez:er_tree_clean_bug_fix
Roman Donchenko [Tue, 29 Oct 2013 09:13:04 +0000 (13:13 +0400)]
Merge pull request #1704 from SpecLad:merge-2.4
Andrey Pavlenko [Tue, 29 Oct 2013 07:14:15 +0000 (11:14 +0400)]
Merge pull request #1663 from vpisarev:ocl_experiments3
Roman Donchenko [Mon, 28 Oct 2013 09:38:25 +0000 (13:38 +0400)]
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
Roman Donchenko [Fri, 25 Oct 2013 16:32:04 +0000 (20:32 +0400)]
Merge pull request #1697 from SpecLad:sdk-redux
Andrey Pavlenko [Fri, 25 Oct 2013 15:47:38 +0000 (19:47 +0400)]
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
Andrey Pavlenko [Fri, 25 Oct 2013 15:41:56 +0000 (19:41 +0400)]
Merge pull request #1689 from ilya-lavrenov:ocl_bilateralFilter
Andrey Pavlenko [Fri, 25 Oct 2013 15:39:21 +0000 (19:39 +0400)]
Merge pull request #1692 from ilya-lavrenov:ocl_separableFilter
Andrey Pavlenko [Fri, 25 Oct 2013 15:35:18 +0000 (19:35 +0400)]
Merge pull request #1694 from apavlenko:fix_typo
Andrey Pavlenko [Fri, 25 Oct 2013 15:34:33 +0000 (19:34 +0400)]
Merge pull request #1693 from ilya-lavrenov:ocl_adaptiveBilateralFilter
Roman Donchenko [Fri, 25 Oct 2013 15:24:57 +0000 (19:24 +0400)]
Merge pull request #1690 from SpecLad:cmake-2.8.12
Roman Donchenko [Fri, 25 Oct 2013 15:10:13 +0000 (19:10 +0400)]
Fixed Android SDK build - again.
Andrey Pavlenko [Fri, 25 Oct 2013 14:00:46 +0000 (18:00 +0400)]
fixing typo
Roman Donchenko [Fri, 25 Oct 2013 13:32:33 +0000 (17:32 +0400)]
Merge pull request #1680 from alalek:cmake_fix_android_builds
Ilya Lavrenov [Fri, 25 Oct 2013 13:28:31 +0000 (17:28 +0400)]
fixed extrapolation in ocl::adaptiveBilateralFilter
Alexander Alekhin [Thu, 24 Oct 2013 16:01:29 +0000 (20:01 +0400)]
cmake: fix android installation for different NDK ABIs
Ilya Lavrenov [Fri, 25 Oct 2013 12:41:20 +0000 (16:41 +0400)]
fixed separable filter extrapolation
Vadim Pisarevsky [Fri, 25 Oct 2013 12:46:03 +0000 (16:46 +0400)]
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.
Roman Donchenko [Fri, 25 Oct 2013 09:54:55 +0000 (13:54 +0400)]
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.
Roman Donchenko [Fri, 25 Oct 2013 09:50:22 +0000 (13:50 +0400)]
Removed a stray comma in the Android toolchain file.
It was actually acting as an additional argument, breaking the error message.
Ilya Lavrenov [Fri, 25 Oct 2013 09:32:35 +0000 (13:32 +0400)]
enabled ocl::bilateralFilter ROI testing
Roman Donchenko [Fri, 25 Oct 2013 09:30:52 +0000 (13:30 +0400)]
Merge pull request #1681 from LeszekSwirski:fix-ninjabuild
Andrey Pavlenko [Fri, 25 Oct 2013 09:19:02 +0000 (13:19 +0400)]
Merge pull request #1683 from alalek:ocl_restore_showdiff
Vadim Pisarevsky [Fri, 25 Oct 2013 07:19:40 +0000 (11:19 +0400)]
fixed some bugs in OpenCL branch of UMat implementation; maybe now the tests will finally pass?! (please ;( )
Vadim Pisarevsky [Thu, 24 Oct 2013 19:31:00 +0000 (23:31 +0400)]
hopefully, the last test failures are fixed now
Vadim Pisarevsky [Thu, 24 Oct 2013 19:18:05 +0000 (23:18 +0400)]
fixed whitespace errors
Vadim Pisarevsky [Thu, 24 Oct 2013 18:33:41 +0000 (22:33 +0400)]
added first very simple test for UMat<=>Mat conversion
Roman Donchenko [Thu, 24 Oct 2013 18:19:16 +0000 (22:19 +0400)]
Merge pull request #1682 from SpecLad:Wmissing-declarations
Leszek Swirski [Thu, 24 Oct 2013 12:58:21 +0000 (13:58 +0100)]
Replace $(Configuration) with $<CONFIGURATION>
Roman Donchenko [Thu, 24 Oct 2013 15:38:43 +0000 (19:38 +0400)]
Merge pull request #1643 from alalek:cmake_fix_java_link_rules
Roman Donchenko [Thu, 24 Oct 2013 15:12:34 +0000 (19:12 +0400)]
Merge pull request #1679 from ilya-lavrenov:ocl_equalizeHist
Alexander Alekhin [Thu, 24 Oct 2013 15:04:41 +0000 (19:04 +0400)]
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").
Roman Donchenko [Thu, 24 Oct 2013 14:33:23 +0000 (18:33 +0400)]
Fixed a Wmissing-declarations warning when compiling with MinGW.
Vadim Pisarevsky [Thu, 24 Oct 2013 14:00:15 +0000 (18:00 +0400)]
yet another attempt to fix test failures
Vadim Pisarevsky [Thu, 24 Oct 2013 13:37:33 +0000 (17:37 +0400)]
fixed crash in Python bindings
Roman Donchenko [Thu, 24 Oct 2013 13:27:21 +0000 (17:27 +0400)]
Merge pull request #1664 from SpecLad:merge-2.4
Vadim Pisarevsky [Thu, 24 Oct 2013 13:23:48 +0000 (17:23 +0400)]
trying to fix failures in tests
Vadim Pisarevsky [Thu, 24 Oct 2013 12:08:15 +0000 (16:08 +0400)]
removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now
Roman Donchenko [Thu, 24 Oct 2013 11:00:27 +0000 (15:00 +0400)]
Merge pull request #1667 from SpecLad:detect-openmp
Roman Donchenko [Thu, 24 Oct 2013 10:18:10 +0000 (14:18 +0400)]
Merge pull request #1623 from ImAlsoGreg:2.4-pkgconfig-dash-l
Roman Donchenko [Thu, 24 Oct 2013 10:09:08 +0000 (14:09 +0400)]
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.
Ilya Lavrenov [Thu, 24 Oct 2013 09:59:25 +0000 (13:59 +0400)]
fixed bug in ocl::equalizeHist
Roman Donchenko [Thu, 24 Oct 2013 09:55:30 +0000 (13:55 +0400)]
Merge pull request #1678 from wejeus:ios-documentationfix-2.4
Roman Donchenko [Thu, 24 Oct 2013 09:54:31 +0000 (13:54 +0400)]
Merge pull request #1674 from alalek:cmake_fix
Samuel Wejéus [Thu, 24 Oct 2013 08:36:01 +0000 (10:36 +0200)]
Removed incorrect release of obtained colorspace. This fixes bug #3318 (updated commit for 2.4 branch)
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:54 +0000 (11:23 +0400)]
Merge pull request #1676 from ilya-lavrenov:ocl_resize_test
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:35 +0000 (11:23 +0400)]
Merge pull request #1673 from ilya-lavrenov:ocl_norm
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:18 +0000 (11:23 +0400)]
Merge pull request #1672 from ilya-lavrenov:ocl_arithm
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:00 +0000 (11:23 +0400)]
Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder
Alexander Alekhin [Wed, 23 Oct 2013 21:29:39 +0000 (01:29 +0400)]
ocl: show diff
Ilya Lavrenov [Wed, 23 Oct 2013 13:20:10 +0000 (17:20 +0400)]
fixed ocl::copyMakeBorder
Ilya Lavrenov [Wed, 23 Oct 2013 18:11:57 +0000 (22:11 +0400)]
fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0)
Alexander Alekhin [Wed, 23 Oct 2013 16:28:22 +0000 (20:28 +0400)]
cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory
Ilya Lavrenov [Wed, 23 Oct 2013 15:53:04 +0000 (19:53 +0400)]
moved to relative errors in ocl::norm tests
Ilya Lavrenov [Wed, 23 Oct 2013 14:42:55 +0000 (18:42 +0400)]
workaround for cv::multiply bug
Roman Donchenko [Wed, 23 Oct 2013 13:42:00 +0000 (17:42 +0400)]
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
Roman Donchenko [Wed, 23 Oct 2013 10:53:31 +0000 (14:53 +0400)]
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
This should actually remove the need for the workaround from
the previous commit.
Roman Donchenko [Tue, 22 Oct 2013 12:43:40 +0000 (16:43 +0400)]
Removed some dubious FFmpeg hack that no longer works.
Roman Donchenko [Tue, 22 Oct 2013 15:13:13 +0000 (19:13 +0400)]
Applied a change from
555c505b to 3rdparty/tbb/CMakeLists.txt.
Odd that it wasn't merged automatically...
Roman Donchenko [Wed, 23 Oct 2013 10:50:55 +0000 (14:50 +0400)]
Merge pull request #1659 from ilya-lavrenov:ocl_examples
Vadim Pisarevsky [Tue, 22 Oct 2013 20:17:18 +0000 (00:17 +0400)]
fixed build on Windows
Vadim Pisarevsky [Tue, 22 Oct 2013 19:34:16 +0000 (23:34 +0400)]
fixed some more compile bugs (including Python bindings)
Roman Donchenko [Tue, 22 Oct 2013 15:16:09 +0000 (19:16 +0400)]
Merge pull request #1649 from asandwhich:2.4
Roman Donchenko [Tue, 22 Oct 2013 15:02:48 +0000 (19:02 +0400)]
Merge pull request #1666 from SpecLad:cv-cap-openni
Roman Donchenko [Tue, 22 Oct 2013 14:47:37 +0000 (18:47 +0400)]
Add better OpenMP detection and make an option to enable it.
Bug report and inspiration: http://code.opencv.org/issues/3328
Vadim Pisarevsky [Tue, 22 Oct 2013 13:41:28 +0000 (17:41 +0400)]
hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors
Roman Donchenko [Tue, 22 Oct 2013 12:44:08 +0000 (16:44 +0400)]
Merge pull request #1665 from SpecLad:cuda-min-ver
Roman Donchenko [Tue, 22 Oct 2013 11:16:22 +0000 (15:16 +0400)]
Suppressed -Wundef in bioinspired, because of OpenCL headers.
Roman Donchenko [Tue, 22 Oct 2013 10:48:25 +0000 (14:48 +0400)]
Fixed incorrectly unprefixed constant names in the OpenNI tutorial.
Bug report: http://code.opencv.org/issues/3329
Roman Donchenko [Mon, 21 Oct 2013 13:39:38 +0000 (17:39 +0400)]
Move the minimal CUDA version into the minimal version list.
Roman Donchenko [Tue, 22 Oct 2013 10:28:00 +0000 (14:28 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
Vadim Pisarevsky [Tue, 22 Oct 2013 10:05:15 +0000 (14:05 +0400)]
the first draft of transparent API and new UMat class. more files
Vadim Pisarevsky [Tue, 22 Oct 2013 10:04:49 +0000 (14:04 +0400)]
the first draft of transparent API and new UMat class.
Roman Donchenko [Tue, 22 Oct 2013 09:53:11 +0000 (13:53 +0400)]
Merge pull request #1653 from jlblancoc:master
Andrey Pavlenko [Tue, 22 Oct 2013 09:46:54 +0000 (13:46 +0400)]
Merge pull request #1658 from alalek:ocl_fixes
Roman Donchenko [Tue, 22 Oct 2013 09:45:23 +0000 (13:45 +0400)]
Merge pull request #1661 from look4pritam:my-branch
look4pritam [Tue, 22 Oct 2013 06:38:43 +0000 (12:08 +0530)]
Small OpenCV-CUDA bugs are fixed.
Ilya Lavrenov [Mon, 21 Oct 2013 16:47:55 +0000 (20:47 +0400)]
OpenCL examples refactoring
Jose-Luis Blanco-Claraco [Mon, 21 Oct 2013 19:43:26 +0000 (21:43 +0200)]
Minimized the number of arguments required to workaround the MSVC2013 compiler bug.
Jose-Luis Blanco-Claraco [Mon, 21 Oct 2013 19:41:27 +0000 (21:41 +0200)]
Added patch file for fixing VS2013 in 3rd party lib OpenEXR
Jose-Luis Blanco-Claraco [Mon, 21 Oct 2013 19:17:15 +0000 (21:17 +0200)]
Added comment to features2d_init.cpp explaining the reason for the extra parameters.
Alexander Alekhin [Mon, 21 Oct 2013 15:48:36 +0000 (19:48 +0400)]
ocl: fix FFT initialization
Alexander Alekhin [Mon, 21 Oct 2013 15:15:11 +0000 (19:15 +0400)]
ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error
Jose-Luis Blanco-Claraco [Mon, 21 Oct 2013 13:59:26 +0000 (15:59 +0200)]
Undo changing whitespace.
Jose-Luis Blanco-Claraco [Mon, 21 Oct 2013 13:57:11 +0000 (15:57 +0200)]
Avoid duplicated variable declarations.
Greg Hale [Mon, 21 Oct 2013 13:27:04 +0000 (09:27 -0400)]
regex doesnt need to match full length of input, so only trying to match the leading -[lL]
Roman Donchenko [Mon, 21 Oct 2013 12:53:24 +0000 (16:53 +0400)]
Merge pull request #1646 from alalek:ocl_fix_msvc11
Roman Donchenko [Mon, 21 Oct 2013 12:35:14 +0000 (16:35 +0400)]
Merge pull request #1575 from jet47:gpu-buffer-pool
Roman Donchenko [Mon, 21 Oct 2013 12:34:44 +0000 (16:34 +0400)]
Merge pull request #1540 from jet47:gpuarithm-cudev
Roman Donchenko [Mon, 21 Oct 2013 12:30:13 +0000 (16:30 +0400)]
Merge pull request #1492 from jet47:gpucodec-cudev
Roman Donchenko [Mon, 21 Oct 2013 12:29:35 +0000 (16:29 +0400)]
Merge pull request #1534 from jet47:fix-cuda-5.0-build
Roman Donchenko [Mon, 21 Oct 2013 12:27:59 +0000 (16:27 +0400)]
Merge pull request #1556 from jet47:fix-bug-3296
Roman Donchenko [Mon, 21 Oct 2013 12:18:02 +0000 (16:18 +0400)]
Merge pull request #1650 from jet47:fix-gpu-bgsegm-sample
Andrey Pavlenko [Mon, 21 Oct 2013 12:06:35 +0000 (16:06 +0400)]
Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative
Andrey Pavlenko [Mon, 21 Oct 2013 12:00:13 +0000 (16:00 +0400)]
Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix
Andrey Pavlenko [Mon, 21 Oct 2013 11:59:19 +0000 (15:59 +0400)]
Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations
Andrey Pavlenko [Mon, 21 Oct 2013 11:58:59 +0000 (15:58 +0400)]
Merge pull request #1633 from ilya-lavrenov:ocl_imgproc
Ilya Lavrenov [Sat, 19 Oct 2013 08:12:16 +0000 (12:12 +0400)]
fixed ocl::Laplacian for case when scale != 1
Ilya Lavrenov [Fri, 18 Oct 2013 13:57:10 +0000 (17:57 +0400)]
missed initialization of kernel size