Roman Donchenko
254aece317
Merge pull request #1753 from abidrahmank:py_tutorials
11 years ago
Roman Donchenko
b5777efee6
Merge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix
11 years ago
Ilya Lavrenov
e9b54ab844
fixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version
11 years ago
Roman Donchenko
8b19df3fec
Merge pull request #1748 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
65389e41db
Revert commit 994e07db0
(PR #1715 ), because it's irrelevant for master.
...
Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
11 years ago
abidrahmank
8bba305487
small correction in Py tutorials
11 years ago
Roman Donchenko
8f5eaca354
Remove the explicit setting of CMP0017, partially undoing #1720 .
...
In master, it's already set to NEW, since we declare the minimal CMake
version as 2.8.7, which is newer than the policy.
11 years ago
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
11 years ago
Andrey Pavlenko
dd942df08b
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access
11 years ago
Andrey Pavlenko
2767be9a5e
Merge pull request #1731 from perping:2.4_haar
11 years ago
Roman Donchenko
9d263db8aa
Merge pull request #1734 from asmorkalov:android_manager_version_inc
11 years ago
Alexander Alekhin
99ae9d9cc1
ocl: corner*: fix memory access in kernels; change error check to relative
11 years ago
Andrey Pavlenko
6c21b85fce
Merge pull request #1733 from ilya-lavrenov:cv_remap
11 years ago
Andrey Pavlenko
ba5dac2edb
Merge pull request #1732 from alalek:ocl_blendLinear
11 years ago
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
11 years ago
Ilya Lavrenov
5546f4d77f
consistency SSE2 and plain versions of convertMaps and remap
11 years ago
Alexander Alekhin
3b293d6855
ocl: fix testdata for blendLinear
11 years ago
perping
af77111cd6
remove whitespace.
11 years ago
Roman Donchenko
e7e6d9d63c
Merge pull request #1729 from ilya-lavrenov:ocl_moments
11 years ago
Roman Donchenko
a9a39a3aa2
Merge pull request #1730 from ilya-lavrenov:ocl_kern_warn
11 years ago
Roman Donchenko
b1bed14ebc
Merge pull request #1728 from apavlenko:refactor_vcap_jni
11 years ago
perping
af33c118b4
fixed a bug of haar.
11 years ago
Ilya Lavrenov
a8b7573db0
fixed ocl::Moments test
11 years ago
Ilya Lavrenov
1f9ab2e0ca
fixed warnings in ocl kernels
11 years ago
Andrey Pavlenko
dfa5a27bee
Merge pull request #1727 from ilya-lavrenov:ocl_warpPerspective
11 years ago
Andrey Pavlenko
fbabc323ed
Merge pull request #1726 from melody-rain:2.4_tvl1_ocl
11 years ago
Andrey Pavlenko
bf58049d11
Merge pull request #1724 from ilya-lavrenov:ocl_thresh
11 years ago
Andrey Pavlenko
e80f5bed2d
Merge pull request #1710 from melody-rain:2.4_moments_ocl
11 years ago
Ilya Lavrenov
c8aed4996e
fixed ocl::warpPerspective
11 years ago
Andrey Pavlenko
a88360bea6
minor refactoring of Android VideoCapture jni code to make it similar to generated one
11 years ago
Jin Ma
3dbcd05407
fixed a typo.
11 years ago
Jin Ma
145ece8f9c
removed test for double since not all platforms support double, thus the sanity check cannot pass on all the platforms.
11 years ago
Jin Ma
599cf6bea0
Resolved a bug and used ocl::multiply.
11 years ago
Ilya Lavrenov
1d5f5d2364
vectorized ocl::threshold for single channel images
11 years ago
Jin Ma
1bb47f4bdf
modified the copyright info.
11 years ago
Andrey Pavlenko
ef9f690598
Merge pull request #1709 from ilya-lavrenov:ocl_cornerharris
11 years ago
Andrey Pavlenko
5795bb326d
Merge pull request #1723 from ilya-lavrenov:ocl_norm
11 years ago
Andrey Pavlenko
ead37e4a29
Merge pull request #1721 from alalek:ocl_fix_filter2D_64F_kernel
11 years ago
Andrey Pavlenko
68c916aa26
Merge pull request #1719 from ilya-lavrenov:ocl_gaussianBlur
11 years ago
Andrey Pavlenko
089cf423a0
Merge pull request #1717 from alalek:ocl_adjust_worksize
11 years ago
Andrey Pavlenko
9751b3204d
Merge pull request #1715 from asmorkalov:android_java_bincompat_fix
11 years ago
Roman Donchenko
27ae6eb1f4
Merge pull request #1720 from SpecLad:cmp0017
11 years ago
Roman Donchenko
2f4d68c746
Merge pull request #1718 from SpecLad:have-opencv-ocl
11 years ago
Ilya Lavrenov
16df5b007d
disabled upload and download perf tests
11 years ago
Ilya Lavrenov
c674d3cf49
fixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0
11 years ago
Alexander Alekhin
0104f59feb
ocl: filter2D: fix processing of kernel with double datatype
11 years ago
Roman Donchenko
104b14e0e0
Fixed CMake warnings/bugs caused by #1670 and #1714
...
include() doesn't create a variable scope, so the settings of
CMAKE_MODULE_PATH and CMAKE_FIND_ROOT_PATH_MODE_* were polluting
everything included after OpenCVDetectCUDA.cmake.
Also, FindCUDA includes FindPackageHandleStandardArgs, which includes
CMakeParseArguments, which causes warnings related to policy CMP0017.
Setting it to NEW seems safe enough.
11 years ago
Roman Donchenko
c70fbb95a3
Merge pull request #1712 from alalek:ocl_split
11 years ago
Ilya Lavrenov
8dfde47f89
changed eps in ocl::GaussianBlur test
11 years ago
Alexander Alekhin
7b0f018a74
ocl: adjust worksize for filter2D and boxFilter
11 years ago