Roman Donchenko
|
b5777efee6
|
Merge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix
|
2013-11-06 13:59:44 +04:00 |
|
Ilya Lavrenov
|
e9b54ab844
|
fixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version
|
2013-11-06 13:53:44 +04:00 |
|
Roman Donchenko
|
65389e41db
|
Revert commit 994e07db0 (PR #1715), because it's irrelevant for master.
Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
|
2013-11-06 12:32:03 +04:00 |
|
Roman Donchenko
|
9c83f6c4fb
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
|
2013-11-05 16:38:23 +04:00 |
|
Andrey Pavlenko
|
dd942df08b
|
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access
|
2013-11-01 18:37:35 +04:00 |
|
Andrey Pavlenko
|
2767be9a5e
|
Merge pull request #1731 from perping:2.4_haar
|
2013-11-01 16:46:18 +04:00 |
|
Roman Donchenko
|
9d263db8aa
|
Merge pull request #1734 from asmorkalov:android_manager_version_inc
|
2013-11-01 16:39:43 +04:00 |
|
Alexander Alekhin
|
99ae9d9cc1
|
ocl: corner*: fix memory access in kernels; change error check to relative
|
2013-11-01 16:38:04 +04:00 |
|
Andrey Pavlenko
|
6c21b85fce
|
Merge pull request #1733 from ilya-lavrenov:cv_remap
|
2013-11-01 15:53:21 +04:00 |
|
Alexander Smorkalov
|
f027cf80f7
|
OpenCV Version++. OpenCV Manager Version++.
|
2013-11-01 15:22:34 +04:00 |
|
Ilya Lavrenov
|
5546f4d77f
|
consistency SSE2 and plain versions of convertMaps and remap
|
2013-11-01 14:50:41 +04:00 |
|
Alexander Alekhin
|
3b293d6855
|
ocl: fix testdata for blendLinear
|
2013-11-01 14:44:13 +04:00 |
|
perping
|
af77111cd6
|
remove whitespace.
|
2013-11-01 17:53:35 +08:00 |
|
Roman Donchenko
|
e7e6d9d63c
|
Merge pull request #1729 from ilya-lavrenov:ocl_moments
|
2013-11-01 11:56:49 +04:00 |
|
Roman Donchenko
|
a9a39a3aa2
|
Merge pull request #1730 from ilya-lavrenov:ocl_kern_warn
|
2013-11-01 11:52:09 +04:00 |
|
Roman Donchenko
|
b1bed14ebc
|
Merge pull request #1728 from apavlenko:refactor_vcap_jni
|
2013-11-01 11:39:44 +04:00 |
|
perping
|
af33c118b4
|
fixed a bug of haar.
|
2013-11-01 14:07:10 +08:00 |
|
Ilya Lavrenov
|
a8b7573db0
|
fixed ocl::Moments test
|
2013-11-01 00:09:11 +04:00 |
|
Ilya Lavrenov
|
1f9ab2e0ca
|
fixed warnings in ocl kernels
|
2013-10-31 23:48:02 +04:00 |
|
Andrey Pavlenko
|
dfa5a27bee
|
Merge pull request #1727 from ilya-lavrenov:ocl_warpPerspective
|
2013-10-31 15:32:34 +04:00 |
|
Andrey Pavlenko
|
fbabc323ed
|
Merge pull request #1726 from melody-rain:2.4_tvl1_ocl
|
2013-10-31 14:03:36 +04:00 |
|
Andrey Pavlenko
|
bf58049d11
|
Merge pull request #1724 from ilya-lavrenov:ocl_thresh
|
2013-10-31 13:55:04 +04:00 |
|
Andrey Pavlenko
|
e80f5bed2d
|
Merge pull request #1710 from melody-rain:2.4_moments_ocl
|
2013-10-31 13:54:46 +04:00 |
|
Ilya Lavrenov
|
c8aed4996e
|
fixed ocl::warpPerspective
|
2013-10-31 13:53:11 +04:00 |
|
Andrey Pavlenko
|
a88360bea6
|
minor refactoring of Android VideoCapture jni code to make it similar to generated one
|
2013-10-31 12:42:12 +04:00 |
|
Jin Ma
|
3dbcd05407
|
fixed a typo.
|
2013-10-31 16:25:50 +08:00 |
|
Jin Ma
|
145ece8f9c
|
removed test for double since not all platforms support double, thus the sanity check cannot pass on all the platforms.
|
2013-10-31 16:21:08 +08:00 |
|
Jin Ma
|
599cf6bea0
|
Resolved a bug and used ocl::multiply.
|
2013-10-31 16:09:33 +08:00 |
|
Ilya Lavrenov
|
1d5f5d2364
|
vectorized ocl::threshold for single channel images
|
2013-10-31 12:00:53 +04:00 |
|
Jin Ma
|
1bb47f4bdf
|
modified the copyright info.
|
2013-10-31 08:47:59 +08:00 |
|
Andrey Pavlenko
|
ef9f690598
|
Merge pull request #1709 from ilya-lavrenov:ocl_cornerharris
|
2013-10-31 00:22:37 +04:00 |
|
Andrey Pavlenko
|
5795bb326d
|
Merge pull request #1723 from ilya-lavrenov:ocl_norm
|
2013-10-31 00:21:29 +04:00 |
|
Andrey Pavlenko
|
ead37e4a29
|
Merge pull request #1721 from alalek:ocl_fix_filter2D_64F_kernel
|
2013-10-31 00:21:10 +04:00 |
|
Andrey Pavlenko
|
68c916aa26
|
Merge pull request #1719 from ilya-lavrenov:ocl_gaussianBlur
|
2013-10-31 00:20:51 +04:00 |
|
Andrey Pavlenko
|
089cf423a0
|
Merge pull request #1717 from alalek:ocl_adjust_worksize
|
2013-10-31 00:20:34 +04:00 |
|
Andrey Pavlenko
|
9751b3204d
|
Merge pull request #1715 from asmorkalov:android_java_bincompat_fix
|
2013-10-31 00:04:03 +04:00 |
|
Roman Donchenko
|
2f4d68c746
|
Merge pull request #1718 from SpecLad:have-opencv-ocl
|
2013-10-30 17:33:03 +04:00 |
|
Ilya Lavrenov
|
16df5b007d
|
disabled upload and download perf tests
|
2013-10-30 17:08:57 +04:00 |
|
Ilya Lavrenov
|
c674d3cf49
|
fixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0
|
2013-10-30 16:48:12 +04:00 |
|
Alexander Alekhin
|
0104f59feb
|
ocl: filter2D: fix processing of kernel with double datatype
|
2013-10-30 16:27:46 +04:00 |
|
Roman Donchenko
|
c70fbb95a3
|
Merge pull request #1712 from alalek:ocl_split
|
2013-10-30 16:18:50 +04:00 |
|
Ilya Lavrenov
|
8dfde47f89
|
changed eps in ocl::GaussianBlur test
|
2013-10-30 16:04:48 +04:00 |
|
Alexander Alekhin
|
7b0f018a74
|
ocl: adjust worksize for filter2D and boxFilter
|
2013-10-30 15:30:47 +04:00 |
|
Roman Donchenko
|
4bc105c40b
|
Merge pull request #1652 from nghiaho12:kalman
|
2013-10-30 15:11:26 +04:00 |
|
Alexander Alekhin
|
50d2c1066b
|
ocl: split: update tests and implementation
|
2013-10-30 14:08:37 +04:00 |
|
Roman Donchenko
|
d07e7897a0
|
Fixed building with OpenCL, but without the ocl module.
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
|
2013-10-30 14:07:34 +04:00 |
|
Alexander Smorkalov
|
994e07db07
|
Bug #3276 Java bindings binary compatibility is broken in branch 2.4 fixed.
New version of Java wrappers' generator uses different wrappers for VideoCapture
on Android and desktop to prevent binary compatibility issues.
|
2013-10-30 12:51:49 +04:00 |
|
Roman Donchenko
|
d11921f1a4
|
Merge pull request #1675 from krodyush:opencl-optimization
|
2013-10-30 12:28:31 +04:00 |
|
Jin Ma
|
7469c2eb9d
|
fixed a bug when double is not supported.
|
2013-10-30 14:37:13 +08:00 |
|
Ilya Lavrenov
|
bf6b5ee925
|
fixed extrapolation for ocl::cornerMinEigenVal and ocl::cornerHarris; enabled CV_32FC1 for the first function
|
2013-10-29 19:59:21 +04:00 |
|