Andrey Pavlenko [Tue, 29 Oct 2013 07:14:15 +0000 (11:14 +0400)]
Merge pull request #1663 from vpisarev:ocl_experiments3
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:30:52 +0000 (13:30 +0400)]
Merge pull request #1681 from LeszekSwirski:fix-ninjabuild
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
Leszek Swirski [Thu, 24 Oct 2013 12:58:21 +0000 (13:58 +0100)]
Replace $(Configuration) with $<CONFIGURATION>
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 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.
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...
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)
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 [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
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.
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.
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.
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
Roman Donchenko [Mon, 21 Oct 2013 10:00:22 +0000 (14:00 +0400)]
Merge pull request #1651 from ilya-lavrenov:misprint
Jose-Luis Blanco-Claraco [Sun, 20 Oct 2013 15:28:45 +0000 (17:28 +0200)]
Fixed MSVC 2013 build errors and workaround for an internal compiler crash.
Ilya Lavrenov [Fri, 18 Oct 2013 21:00:22 +0000 (01:00 +0400)]
added reflect, reflect101, replicate, wrap border types to ocl::remap
Ilya Lavrenov [Sat, 19 Oct 2013 18:59:47 +0000 (22:59 +0400)]
misprint
Vladislav Vinogradov [Sat, 19 Oct 2013 08:40:10 +0000 (12:40 +0400)]
fix bug in gpu bgsegm sample
create `d_fgimg` matrix before cleaning.
Ilya Lavrenov [Fri, 18 Oct 2013 21:17:46 +0000 (01:17 +0400)]
made more demonstrative message about test fails
Alexander Alekhin [Fri, 18 Oct 2013 16:43:34 +0000 (20:43 +0400)]
ocl: workaround for msvc11 bug
"#error" requires DOS line endings (or fails with fatal error C1004: unexpected end-of-file found)
See: http://connect.microsoft.com/VisualStudio/feedback/details/794991/c-error-directive-and-unix-line-endings-leads-to-an-unexpected-end-of-file
So replace them to #pragma message.
Andrey Pavlenko [Fri, 18 Oct 2013 14:41:12 +0000 (18:41 +0400)]
Merge pull request #1587 from alalek:opencl_khronos_headers
Roman Donchenko [Fri, 18 Oct 2013 14:39:06 +0000 (18:39 +0400)]
Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix
Roman Donchenko [Fri, 18 Oct 2013 14:22:59 +0000 (18:22 +0400)]
Merge pull request #1641 from jet47:imshow-opengl-fix
Roman Donchenko [Fri, 18 Oct 2013 14:19:35 +0000 (18:19 +0400)]
Merge pull request #1642 from alalek:cmake_cleanup_targets
Ilya Lavrenov [Fri, 18 Oct 2013 13:34:17 +0000 (17:34 +0400)]
refactored ocl matrix operations accuracy tests
Ilya Lavrenov [Fri, 18 Oct 2013 12:46:00 +0000 (16:46 +0400)]
enabled double in copyMakeBorder kernel
Ilya Lavrenov [Fri, 18 Oct 2013 12:41:09 +0000 (16:41 +0400)]
rewrote ocl::remap
Ilya Lavrenov [Fri, 18 Oct 2013 12:39:47 +0000 (16:39 +0400)]
fixed ocl::copyMakeBorder
Ilya Lavrenov [Fri, 18 Oct 2013 12:36:11 +0000 (16:36 +0400)]
added ROI support to ocl::convolve
Ilya Lavrenov [Fri, 18 Oct 2013 12:33:48 +0000 (16:33 +0400)]
added ROI support to ocl::columnSum
Ilya Lavrenov [Fri, 18 Oct 2013 12:31:52 +0000 (16:31 +0400)]
added ROI support to ocl::CLAHE
Ilya Lavrenov [Fri, 18 Oct 2013 12:29:10 +0000 (16:29 +0400)]
refactored all the tests in ocl/test/test_imgproc.cpp
Alexander Alekhin [Fri, 11 Oct 2013 15:32:31 +0000 (19:32 +0400)]
ocl: update autogenerated code
Alexander Alekhin [Fri, 11 Oct 2013 15:30:47 +0000 (19:30 +0400)]
ocl: force to use Khronos OpenCL headers
Alexander Alekhin [Tue, 8 Oct 2013 16:26:54 +0000 (20:26 +0400)]
added Khronos OpenCL 1.2 header files
Andrey Pavlenko [Fri, 18 Oct 2013 09:45:12 +0000 (13:45 +0400)]
Merge pull request #1640 from alalek:ocl_fix_exp_test
Andrey Pavlenko [Fri, 18 Oct 2013 09:44:40 +0000 (13:44 +0400)]
Merge pull request #1626 from ilya-lavrenov:ocl_filters
Roman Donchenko [Thu, 17 Oct 2013 13:16:58 +0000 (17:16 +0400)]
Updated ffmpeg_vesion.cmake after #1516.
Alexander Alekhin [Thu, 17 Oct 2013 19:42:37 +0000 (23:42 +0400)]
cmake: cleanup OpenCVModules_TARGETS from cache
This will allow to disable modules between cmake runs
Vladislav Vinogradov [Thu, 17 Oct 2013 16:54:43 +0000 (20:54 +0400)]
fix imshow under Windows with OpenGL support:
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
Alexander Alekhin [Thu, 17 Oct 2013 14:46:27 +0000 (18:46 +0400)]
ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow
Roman Donchenko [Thu, 17 Oct 2013 13:19:04 +0000 (17:19 +0400)]
Merge tag '2.4.6.2' into 2.4
OpenCV 2.4.6.2 (Tegra detection and native camera update)
Roman Donchenko [Thu, 17 Oct 2013 13:00:45 +0000 (17:00 +0400)]
Merge pull request #1636 from ilya-lavrenov:ocl_loop_times
Roman Donchenko [Thu, 17 Oct 2013 11:42:37 +0000 (15:42 +0400)]
Merge pull request #1369 from StevenPuttemans:fix_featuretracker
Roman Donchenko [Thu, 17 Oct 2013 11:41:15 +0000 (15:41 +0400)]
Merge pull request #1516 from akarsakov:new_ffmpeg_build
Ilya Lavrenov [Wed, 16 Oct 2013 14:23:05 +0000 (18:23 +0400)]
made LOOP_TIMES as a command line option with default value=1
Alexander Karsakov [Fri, 27 Sep 2013 08:33:57 +0000 (12:33 +0400)]
Updated build of ffmpeg library (v 2.0.2). Builded with mingw (gcc 4.6.1) with
folowing additional options: --enable-w32threads, --arch=i686 (for 32-bit
library, workaround for http://trac.ffmpeg.org/ticket/2363)
Roman Donchenko [Thu, 17 Oct 2013 08:25:30 +0000 (12:25 +0400)]
Merge pull request #1637 from SpecLad:run-py-java-fix
Ilya Lavrenov [Mon, 14 Oct 2013 10:45:15 +0000 (14:45 +0400)]
refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter
Andrey Pavlenko [Thu, 17 Oct 2013 08:07:20 +0000 (12:07 +0400)]
Merge pull request #1613 from alalek:ocl_cvtcolor
Andrey Pavlenko [Thu, 17 Oct 2013 07:59:27 +0000 (11:59 +0400)]
Merge pull request #1632 from alalek:cmake_find_package_build_dir
Andrey Pavlenko [Thu, 17 Oct 2013 07:55:25 +0000 (11:55 +0400)]
Merge pull request #1635 from alalek:cmake_fix_export_java
Andrey Pavlenko [Thu, 17 Oct 2013 07:55:03 +0000 (11:55 +0400)]
Merge pull request #1634 from alalek:cmake_fix_cuda_linker_deps
Alexander Alekhin [Sat, 12 Oct 2013 12:52:25 +0000 (16:52 +0400)]
ocl: rewrite CvtColor tests, added roi support
Roman Donchenko [Wed, 16 Oct 2013 15:22:01 +0000 (19:22 +0400)]
Fix running Java tests with run.py on everything other than Windows.
Previously, run.py would assume that the opencv_java library is in the
same directory as the tests, which is only true on Windows.
The library path depends on the build configuration, which may not be
known until the actual build (e.g. with the Visual Studio generators),
so it can't be stored in the CMake cache for run.py to read. I didn't
want to hardcode into run.py where the library is on each platform,
either. So that's why I used the current scheme with the properties
file. It also makes running the tests without run.py a little easier.
Alexander Alekhin [Wed, 16 Oct 2013 11:47:51 +0000 (15:47 +0400)]
cmake: fix linker deps for CUDA
Alexander Alekhin [Wed, 16 Oct 2013 13:23:44 +0000 (17:23 +0400)]
cmake: add opencv_java into list of exported targets (fix for android)
Roman Donchenko [Wed, 16 Oct 2013 09:38:30 +0000 (13:38 +0400)]
Merge pull request #1631 from alalek:merge-2.4
Roman Donchenko [Wed, 16 Oct 2013 09:22:25 +0000 (13:22 +0400)]
Merge pull request #1375 from jet47:gpu-examples-build
Alexander Alekhin [Tue, 15 Oct 2013 19:05:40 +0000 (23:05 +0400)]
cmake: restore find_package() for build directory
Alexander Alekhin [Tue, 15 Oct 2013 14:43:37 +0000 (18:43 +0400)]
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
Roman Donchenko [Tue, 15 Oct 2013 14:36:15 +0000 (18:36 +0400)]
Merge pull request #1630 from SpecLad:java-deprecated-assert
Roman Donchenko [Tue, 15 Oct 2013 14:05:58 +0000 (18:05 +0400)]
Merge pull request #1627 from SpecLad:java-version-no-inline
Roman Donchenko [Tue, 15 Oct 2013 13:10:12 +0000 (17:10 +0400)]
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.
We don't use it, anyway.
Roman Donchenko [Tue, 15 Oct 2013 11:44:26 +0000 (15:44 +0400)]
In Java bindings, wrap version constants into functions to prevent inlining.
Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.
This arranges that by turning constant values into function calls, which no
longer count as a constant expression.