mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-21 05:28:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,476 Commits 6 Branches 127 Tags 3 GiB
2bb3de5aa0
Commit Graph

8154 Commits

Author SHA1 Message Date
Ilya Lavrenov
6770c04073 refactored some functions from ocl arithm 2013-11-13 13:56:49 +04:00
Ilya Lavrenov
c38e4f9639 added eps to ocl::buildWarpPerspectiveMaps perf test 2013-11-13 13:04:02 +04:00
Roman Donchenko
376993be4c Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn 2013-11-13 12:20:09 +04:00
Michael Pratt
73f1940b03 Add missing limits include 
Without limits included, several CUDA related files fail to compile with
GCC on Ubuntu:

modules/cudaimgproc/src/hough_lines.cpp:136:9: error: ‘numeric_limits’ is not a member of ‘std’
 2013-11-12 22:29:41 -05:00
perping
185059959b fix haar 2013-11-13 10:19:09 +08:00
perping
1e2fb6de30 fix match_template and haar 2013-11-13 10:09:39 +08:00
Ilya Lavrenov
0bf7350615 fixed compilation of ocl::minMaxLoc for Intel device 2013-11-12 19:14:40 +04:00
huangs
f02ce90559 minX1 should be max(-maxD,0) not max(maxD,0), avoid black band at left 2013-11-12 22:37:23 +08:00
Roman Donchenko
b8e3d3f791 In the image sequence capture, only search for the ordinal in the file name. 
Searching in directory names can yield confusing results; e.g. if
the input is "jpeg2000/image1.jp2", it will infer the pattern
"jpeg%04d/image1.jp2", which is likely not what the user intended.

If the user really desires for the variable part to be in the
directory name, it can always use an explicit pattern.
 2013-11-12 16:26:21 +04:00
Ilya Lavrenov
96121a66c5 kernel warnings on AMD 2013-11-12 15:06:46 +04:00
Roman Donchenko
a81efdbb25 Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor 2013-11-12 14:26:50 +04:00
perping
d6e0ef2710 fix linux warning. 2013-11-12 18:13:44 +08:00
perping
dee584ee15 fix haar 2013-11-12 17:54:03 +08:00
Roman Donchenko
834705490e Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat 2013-11-12 12:53:34 +04:00
Roman Donchenko
ef4eadd5d3 Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear 2013-11-12 12:40:14 +04:00
Roman Donchenko
46e423d217 Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps 2013-11-12 12:26:37 +04:00
perping
8af626d295 fix some bug about haar and match_template. 2013-11-12 13:56:47 +08:00
Ilya Lavrenov
eda6360fa3 added RGB5x5 <-> Gray 2013-11-12 00:32:10 +04:00
Philippe FOUBERT
93120775cd Using four spaces for indentation. 2013-11-11 20:40:18 +01:00
Roman Donchenko
405227d531 Replaced the image used in the Highgui_Video.ffmpeg_image test. 
Our prebuilt FFmpeg Windows binaries don't have PNG support enabled
(because that requires zlib), so that makes a PNG image a bad choice
for this test.

When FFmpeg doesn't support PNG, VideoCapture falls back to the
"image sequence" implementation, which doesn't work for single images.
 2013-11-11 18:30:04 +04:00
Ilya Lavrenov
daedc6f454 removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter 2013-11-11 18:14:44 +04:00
Roman Donchenko
eff53e95f9 Fixed the "image sequence" capture not failing when a pattern isn't found. 
at can't be a null pointer, so the condition was always false, and
a nonsensical pattern like "image.png%00d" was being inferred.
 2013-11-11 18:12:49 +04:00
Ilya Lavrenov
3727168b50 added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file 2013-11-11 18:07:23 +04:00
Roman Donchenko
ccbd7f8da9 Added a citation which used to be in the gpu module in 2.4. 2013-11-11 18:00:55 +04:00
Roman Donchenko
bfa40e180f Removed another usage of __func__, following #1763. 2013-11-11 17:02:50 +04:00
Roman Donchenko
e4dee5b372 Merge pull request #1780 from ilya-lavrenov:ocl_m_pi 2013-11-11 17:00:31 +04:00
Roman Donchenko
4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
 2013-11-11 16:55:36 +04:00
Ilya Lavrenov
1f421fce01 added RGB5x5 <-> RGB conversion 2013-11-11 14:50:44 +04:00
Philippe FOUBERT
05d9375759 Trailing whitespace removal. 2013-11-11 10:26:28 +01:00
perping
73b34e3f85 fix warning. 2013-11-11 15:06:58 +08:00
perping
50579d2524 Make Integral sum support cv_32f, sqsum support cv_64f. 2013-11-11 14:31:02 +08:00
Ilya Lavrenov
5beb887247 replaced custom PI by OpenCL M_PI constant 2013-11-11 00:55:59 +04:00
Ilya Lavrenov
3cc9502c90 added RGB[A] <-> BGR[A] conversion to ocl::cvtColor 2013-11-10 23:14:36 +04:00
Philippe FOUBERT
8b0fc04d93 Fix the build of OpenCV with XIMEA on Windows 64 bits: 
- crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
  - the "CMAKE_CL_64" variable is not initialized when using mingw

PR#1039 modified to be able to merge on branch 2.4
 2013-11-10 17:46:59 +01:00
Ilya Lavrenov
581a3e444d added XYZ to RGB conversion to ocl::cvtColor 2013-11-10 14:37:21 +04:00
Ilya Lavrenov
5e02b20482 added RGB -> XYZ conversion to ocl::cvtColor 2013-11-10 13:38:09 +04:00
Ilya Lavrenov
33ae64201c color.cpp refactoring: created generic interface for toRGB and fromRGB callers 2013-11-10 00:44:37 +04:00
Ilya Lavrenov
a57030a0cd added YCrCb to RGB, BGR, RGBA, BGRA modes to ocl::cvtColor 2013-11-09 17:03:30 +04:00
Ilya Lavrenov
eba6754b06 fixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA 2013-11-09 00:40:45 +04:00
Ilya Lavrenov
8b57893e40 added an accuracy test for ocl::buildWarpPerspectiveMaps 2013-11-08 18:42:13 +04:00
Ilya Lavrenov
4248f82211 added ROI support to ocl::buildWarp*Maps functions 2013-11-08 18:40:53 +04:00
Roman Donchenko
0ac61240c5 Merge pull request #1771 from kiranpradeep:2.4 2013-11-08 17:16:20 +04:00
Kiran Pradeep
5852a913a8 CMake's get_filename_component with NAME_WE parameters, interprets first period as start of extension. For. e.g file name with out extension of 'this.is.a.text.file.txt' will be taken as 'this'. Hence using NAME with regex replacement to get 'this.is.a.text.file' 2013-11-08 14:09:34 +05:30
Roman Donchenko
800d53f76b Merge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters 2013-11-08 12:39:14 +04:00
Roman Donchenko
0be2752366 Merge pull request #1755 from KonstantinMatskevich:dump_info 2013-11-08 12:31:04 +04:00
Roman Donchenko
0fb629915f Merge pull request #1763 from SpecLad:cv-func 2013-11-08 12:29:50 +04:00
Michael Pratt
8aafd569c8 Support PyString_AsString() in Python 3 < 3.3 
In Python 3, version 3.3+, PyUnicode_AsUTF8() provides similar
functionality to Python 2's PyString_AsString().

In older versions of Python 3, there is no public function to provide
the same functionality.  However, the "internal" _PyUnicode_AsString()
does provide that functionality, so use it to replace
PyString_AsString().

With this patch, cv2 should compile for Python 3.[0-2].
 2013-11-07 23:47:33 -05:00
Baichuan Su
9a0d06247a Fix the whitespace warning. 2013-11-07 15:04:17 -08:00
Ilya Lavrenov
760b718981 added CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode) 2013-11-08 01:42:48 +04:00
Baichuan Su
99a00d3dd9 Fix merge conflicts 2013-11-07 09:56:59 -08:00
Baichuan Su
befcbf56fe A minor fix. 2013-11-07 08:52:40 -08:00
Baichuan Su
f0de1a08b8 Fix ocl::calcHarris not support CV_32FC1 bug. 2013-11-07 08:52:39 -08:00
Roman Donchenko
07db81a4bb Merge pull request #1760 from ilya-lavrenov:ocl_remap_nn 2013-11-07 17:29:16 +04:00
Roman Donchenko
2c38be079e Enabled CV_Assert and such to print the function name with Visual C++. 
Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it.
 2013-11-07 17:22:02 +04:00
Konstantin Matskevich
e9edfd1c54 update 2013-11-07 17:21:56 +04:00
Roman Donchenko
641bb7ac6b Merge pull request #1737 from vrabaud:2.4 2013-11-07 12:03:30 +04:00
Bo Hu
c88fa27b1d Removed trailing whitespace in cap_qtkit.mm. 2013-11-06 13:33:17 -08:00
Bo Hu
114579c33b Added proper testing of the end of quicktime video files. 
CvCaptureFile::grabFrame() always returns 1 regardless, which causes
dead loop when relying on the return value of VideoCapture::read().
 2013-11-06 13:32:11 -08:00
Ilya Lavrenov
fa15769f39 added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only) 2013-11-06 23:14:04 +04:00
Ilya Lavrenov
56d943388d speeded up ocl::distanceToCenters 2013-11-06 20:02:31 +04:00
Andrey Pavlenko
296f76a135 Merge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer 2013-11-06 18:26:39 +04:00
Harris Gasparakis
a1de91a4fd Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs 2013-11-06 16:48:50 +04:00
Konstantin Matskevich
5304e9f259 extending openCL info dump 2013-11-06 15:20:05 +04:00
Roman Donchenko
370235c07b Merge pull request #1711 from SpecLad:cap-broken-mat 2013-11-06 14:53:08 +04:00
Alexander Alekhin
03646e7e01 ocl: workaround for subbuffer memory leaks 2013-11-06 14:02:41 +04:00
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
Andrey Pavlenko
43c9157220 Merge pull request #1750 from alalek:ocl_update_documentation 2013-11-06 13:32:00 +04:00
Andrey Pavlenko
a3fa7a243d Merge pull request #1740 from ilya-lavrenov:ocl_corners 2013-11-06 13:31:44 +04:00
Andrey Pavlenko
95767676b7 Merge pull request #1739 from pengx17:2.4_ocl_overload_haar 2013-11-06 13:31:11 +04:00
Roman Donchenko
5c44afa427 Merge pull request #1743 from ilya-lavrenov:ocl_repeat 2013-11-06 13:24:22 +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
peng xiao
53d1873776 Revert back test image. 2013-11-06 11:19:26 +08:00
Alexander Alekhin
3952a0df44 ocl: update comments in ocl.hpp 2013-11-05 23:53:52 +04:00
Alexander Alekhin
5a333bfff4 ocl: update documentation 2013-11-05 23:53:51 +04:00
Andrey Pavlenko
be37d99567 Merge pull request #1752 from alalek:ocl_memory_cleanup_workaround 2013-11-05 23:49:37 +04:00
Andrey Pavlenko
14c3560750 Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix 2013-11-05 23:49:12 +04:00
Alexander Alekhin
691d5f4187 ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard 2013-11-05 19:43:07 +04:00
Ilya Lavrenov
e544e34eed fixed ocl::copyMakeBorder accuracy test 2013-11-05 18:23:34 +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
Alexander Alekhin
7704dbf866 ocl: svm: restore non BLAS version 2013-11-05 15:15:26 +04:00
Alexander Alekhin
9a63508f50 Revert "disable SVM when AMD BLAS is not available" 
This reverts commit d63a38e9bf.

Conflicts:
	modules/ocl/test/test_ml.cpp
 2013-11-05 15:13:30 +04:00
Vincent Rabaud
0b1df62215 add VERBATIM as advised by @SpecLad 2013-11-05 12:02:22 +01:00
Vincent Rabaud
3b0108e4c1 fix the crash as suggested by @SpecLad 2013-11-05 11:18:20 +01:00
Ilya Lavrenov
e7e7e04dce came back to relative error 2013-11-05 14:17:31 +04:00
Ilya Lavrenov
2df53d97c5 added ocl::repeat 2013-11-05 12:23:20 +04:00
peng xiao
2a111f7a6c Let perf/accuracy test of ocl haar uses detectMultiScale api. 
Fix image to be used by perf test.
 2013-11-05 10:40:27 +08:00
Ilya Lavrenov
c89dfd333c fixed warnings in OpenCL kernels 2013-11-04 15:30:00 +04:00
Ilya Lavrenov
a8426e1c12 fixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests 2013-11-04 15:16:00 +04:00
peng xiao
8c1eb5bf0e Overload detectMultiScale API for ocl::haar. 2013-11-04 14:59:28 +08:00
Vincent Rabaud
e1b2f593d6 fix crash when path has spaces 
The paths are defined properly with an escape "\ " but you cannot have an escape and
quotes when piping (otherwise, escapes are understood as 2 characters).
So just remove the quotes.
 2013-11-01 19:30:58 +01: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
Roman Donchenko
d6a7a6d503 VideoCapture: copy the captured frame, to avoid dangling Mats 
Previously, VideoCapture::retrieve would return a Mat that referenced
the internal IplImage. Since the latter is rewritten every time a
frame is captured, it means that if the user captures two frames in a row,
the first frame would reference nothing. Similar if a user captures a frame,
then destroys the VideoCapture instance.

Note that the other branch of the if isn't affected, since flip allocates
a new Mat.
 2013-10-29 18:47:08 +04:00
Roman Donchenko
03bbee327b Merge pull request #1486 from nzjrs:cv2-logpolar 2013-10-29 16:15:57 +04:00
Roman Donchenko
f68b73f831 Merge pull request #1521 from nailbiter:optimCG 2013-10-29 16:14:32 +04:00
Roman Donchenko
334292083e Merge pull request #1629 from lluisgomez:er_tree_clean_bug_fix 2013-10-29 16:03:51 +04:00
Jin Ma
b6b190df5c Rewrote moments of opencl version. 2013-10-29 18:05:29 +08:00
Roman Donchenko
75087580de Merge pull request #1704 from SpecLad:merge-2.4 2013-10-29 13:13:05 +04:00
Andrey Pavlenko
616db74e49 Merge pull request #1663 from vpisarev:ocl_experiments3 2013-10-29 11:14:16 +04:00
Andrey Pavlenko
c5e8a9a29b Merge pull request #1702 from alalek:ocl_memory_corruption_check 2013-10-29 11:07:04 +04:00
Andrey Pavlenko
c6a01f2641 Merge pull request #1688 from alalek:ocl_fix_filters 2013-10-29 11:05:10 +04:00
Andrey Pavlenko
ea64589164 Merge pull request #1687 from bitwangyaoyao:2.4_fix 2013-10-29 11:03:34 +04:00
Andrey Pavlenko
f4b8babbc8 Merge pull request #1677 from pengx17:patch-1 2013-10-29 11:00:26 +04:00
Andrey Pavlenko
42c4f91ef4 Merge pull request #1495 from StevenPuttemans:bugfix_3282 2013-10-29 10:51:01 +04:00
Andrey Pavlenko
9bfa346c38 Merge pull request #1544 from ilya-lavrenov:ocl_blendLinear 2013-10-29 10:49:46 +04:00
Andrey Pavlenko
e52459a324 Merge pull request #1708 from ilya-lavrenov:ocl_threshold 2013-10-29 10:43:44 +04:00
Andrey Pavlenko
106d5eda5f Merge pull request #1700 from ilya-lavrenov:ocl_bitwise_perf 2013-10-29 10:43:27 +04:00
Andrey Pavlenko
acadfcff2d Merge pull request #1707 from ilya-lavrenov:ocl_morph 2013-10-29 10:38:23 +04:00
Andrey Pavlenko
2b05dc7d1e Merge pull request #1699 from ilya-lavrenov:ocl_minMax 2013-10-29 10:35:58 +04:00
Andrey Pavlenko
5fa6d70ab0 Merge pull request #1695 from ilya-lavrenov:ocl_showDiff 2013-10-29 10:35:42 +04:00
Ilya Lavrenov
c49c3e0a91 fixed and generalized ocl::blendLinear 2013-10-28 23:56:40 +04:00
Ilya Lavrenov
58be2546ca fixed OpenCL morph operations for case when kernel does not have zero element 2013-10-28 20:09:49 +04:00
Alexander Alekhin
b10e1e5c7e ocl: filters: update documentation 2013-10-28 20:09:49 +04:00
Alexander Alekhin
98f73705df ocl: fix morph filters 2013-10-28 20:09:49 +04:00
Alexander Alekhin
0f95f0d8b3 ocl: rewrite filter2D 2013-10-28 20:09:49 +04:00
Alexander Alekhin
0bf9ece998 ocl: rewrite boxFilter 2013-10-28 20:09:49 +04:00
Alexander Alekhin
cb6ea8bfa1 ocl: update filter tests 2013-10-28 20:09:49 +04:00
Roman Donchenko
529f086b62 Merge pull request #1691 from SpecLad:ffmpeg-test 2013-10-28 19:35:08 +04:00
Alexander Alekhin
447c052e59 ocl: memory corruption check 2013-10-28 19:33:00 +04:00
Andrey Pavlenko
95bd32b516 Merge pull request #1705 from ilya-lavrenov:ocl_flip 2013-10-28 19:02:24 +04:00
Andrey Pavlenko
bb15c00665 Merge pull request #1703 from bitwangyaoyao:2.4_fix1480 2013-10-28 19:01:51 +04:00
Andrey Pavlenko
d3c0b36cd0 Merge pull request #1701 from alalek:ocl_fix_canny 2013-10-28 19:01:13 +04:00
Andrey Pavlenko
1cc58f9770 Merge pull request #1698 from ilya-lavrenov:ocl_warp 2013-10-28 18:59:08 +04:00
Ilya Lavrenov
7afbae57ba fixed ocl::minMax for FP-types 2013-10-28 18:49:16 +04:00
Ilya Lavrenov
eb2f8a2948 ocl tests: show diff when cv::countNonZero(diff) > 0 2013-10-28 18:20:02 +04:00
Ilya Lavrenov
1f7f9c9682 rewrote and generalized ocl::threshold 2013-10-28 18:11:24 +04:00
Ilya Lavrenov
e70dfe5a50 fixed OpenCL morph operations for case when kernel does not have zero element 2013-10-28 16:46:41 +04:00
Ilya Lavrenov
cf5df1a7e7 fixed ocl::flip 2013-10-28 13:57:29 +04:00
Roman Donchenko
d3bcf609f1 Merge pull request #1657 from KonstantinMatskevich:ocldistanceToCenters 2013-10-28 13:46:32 +04:00
Roman Donchenko
78be4f66f7 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
 2013-10-28 13:38:25 +04:00
yao
0fd872bfa9 fix bug #1480 2013-10-28 17:36:43 +08:00
yao
632452cdd8 fix the mismatch running on cpu devices 2013-10-28 16:32:46 +08:00
Roman Donchenko
88f5ef9acc Merge pull request #1696 from apavlenko:fix_typo_GpuMaterials 2013-10-28 12:18:42 +04:00
Peng Xiao
ab2bd58f5c Fixed a missing barrier. 2013-10-28 14:17:59 +08:00
konstantin
973137c78e fix bugs on host and device sides for imgprog_sobel3.cl 2013-10-28 00:14:07 +04:00
Alexander Alekhin
eb4f50ca59 ocl: Canny: port CUDA-based implementation of edgesHysteresisLocal 2013-10-28 00:10:47 +04:00
Ilya Lavrenov
900c303636 added performance tests for ocl::bitwise_or and ocl::bitwose_xor 2013-10-27 20:08:50 +04:00
Alexander Alekhin
9e527fc9f4 ocl: Canny: replace unsafe buffer to oclMat 2013-10-27 18:55:42 +04:00
Ilya Lavrenov
839245e420 fixed tests for ocl::warpAffine and ocl::warpPerspective 2013-10-27 14:49:37 +04:00
konstantin
ddd2b106fb rename imageproc_sobel2.cl -> imageproc_sobel3.cl for consistency 2013-10-25 21:44:01 +04:00
Andrey Pavlenko
66e5be2d64 Merge pull request #1655 from pengx17:2.4_opt_superres_ocl 2013-10-25 19:47:38 +04:00
Andrey Pavlenko
fc64a4071c Merge pull request #1689 from ilya-lavrenov:ocl_bilateralFilter 2013-10-25 19:41:56 +04:00
Andrey Pavlenko
4e57f92e6e Merge pull request #1692 from ilya-lavrenov:ocl_separableFilter 2013-10-25 19:39:21 +04:00
Andrey Pavlenko
d60924f4f2 Merge pull request #1694 from apavlenko:fix_typo 2013-10-25 19:35:19 +04:00
Andrey Pavlenko
2e5db6e56c fixing typo 2013-10-25 18:53:24 +04:00
Andrey Pavlenko
2b6fca68bf fixing typo 2013-10-25 18:00:46 +04:00
Ilya Lavrenov
e1596d69cc fixed extrapolation in ocl::adaptiveBilateralFilter 2013-10-25 17:29:21 +04:00
Ilya Lavrenov
b33a62beb0 fixed separable filter extrapolation 2013-10-25 17:08:44 +04:00
Vadim Pisarevsky
485d36d3c0 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. 2013-10-25 16:46:03 +04:00
Roman Donchenko
36b5180aa1 Another FFmpeg fix from master. 
From commit dd74a851, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.

Also modified some gpu sources in a similar manner.
 2013-10-25 16:08:14 +04:00
peng xiao
68a8a11161 Rewrite distanceToCenters. 
It supports NORM_L1 distance types now and can
use user provided indices.
Also fixed a bug of kmeans where distance pointers should be float instead
 of double.

NORM_L2 changed to NORM_L2SQR, Accuracy and Perf tests are added

added ROI support in accuracy test of distanceToCenters
 2013-10-25 15:02:00 +04:00
Roman Donchenko
1188894133 Fixed indentation in CV_FFmpegWriteBigVideoTest::run. 2013-10-25 14:37:54 +04:00
Roman Donchenko
2ca49eef37 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.

(cherry picked from commit dfe07df87b)
 2013-10-25 14:34:02 +04:00
Roman Donchenko
5a5d569d72 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

(cherry picked from commit 424a7b0ab0)

Conflicts:
	modules/highgui/test/test_ffmpeg.cpp
 2013-10-25 14:31:27 +04:00
Roman Donchenko
260c2e0b08 Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp. 
(cherry picked from commit 3f3ae33327)
 2013-10-25 14:29:37 +04:00
Ilya Lavrenov
9ea6001d08 enabled ocl::bilateralFilter ROI testing 2013-10-25 13:32:35 +04:00
Andrey Pavlenko
f177e65871 Merge pull request #1683 from alalek:ocl_restore_showdiff 2013-10-25 13:19:02 +04:00
yao
dd0fa63ca8 fix the bug of ocl::bruteForceMatcher 2013-10-25 16:01:41 +08:00
Vadim Pisarevsky
6416c33020 fixed some bugs in OpenCL branch of UMat implementation; maybe now the tests will finally pass?! (please ;( ) 2013-10-25 11:19:40 +04:00
Vadim Pisarevsky
ace0d4bad0 hopefully, the last test failures are fixed now 2013-10-24 23:31:00 +04:00
Vadim Pisarevsky
5920bd4f2e fixed whitespace errors 2013-10-24 23:18:05 +04:00
Vadim Pisarevsky
caa33b2242 added first very simple test for UMat<=>Mat conversion 2013-10-24 22:33:41 +04:00
Roman Donchenko
3b08bf6b62 Merge pull request #1682 from SpecLad:Wmissing-declarations 2013-10-24 22:19:17 +04:00
Leszek Swirski
6e4fb8f275 Replace $(Configuration) with $<CONFIGURATION> 2013-10-24 18:20:16 +01:00
Roman Donchenko
496859a944 Merge pull request #1643 from alalek:cmake_fix_java_link_rules 2013-10-24 19:38:43 +04:00
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").
 2013-10-24 19:04:59 +04:00
Roman Donchenko
f51e490bad Fixed a Wmissing-declarations warning when compiling with MinGW. 2013-10-24 18:35:08 +04:00
Vadim Pisarevsky
b1aa4a4913 yet another attempt to fix test failures 2013-10-24 18:00:15 +04:00
Vadim Pisarevsky
e14171fd33 fixed crash in Python bindings 2013-10-24 17:37:33 +04:00
Roman Donchenko
7e1ded0ebd Merge pull request #1664 from SpecLad:merge-2.4 2013-10-24 17:27:30 +04:00
Vadim Pisarevsky
a9065b7d0c trying to fix failures in tests 2013-10-24 17:23:48 +04:00
Vadim Pisarevsky
303df78cca removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now 2013-10-24 16:08:15 +04:00
Roman Donchenko
dfe07df87b 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.
 2013-10-24 14:09:08 +04:00
Ilya Lavrenov
dab3000778 fixed bug in ocl::equalizeHist 2013-10-24 13:59:25 +04:00
Andrey Pavlenko
2279c209c8 Merge pull request #1676 from ilya-lavrenov:ocl_resize_test 2013-10-24 11:23:55 +04:00
Andrey Pavlenko
931a2ae14f Merge pull request #1673 from ilya-lavrenov:ocl_norm 2013-10-24 11:23:36 +04:00
Andrey Pavlenko
e7f39eb46e Merge pull request #1672 from ilya-lavrenov:ocl_arithm 2013-10-24 11:23:19 +04:00
Andrey Pavlenko
4cf598a862 Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder 2013-10-24 11:23:01 +04:00
Peng Xiao
4b712eeded Update imgproc_canny.cl 
Reordering condition checking.
 2013-10-24 12:07:54 +08:00
Alexander Alekhin
133d889e33 ocl: show diff 2013-10-24 03:44:56 +04:00
konstantin
9f0995fbe0 try to made compatible with mac 2013-10-23 23:56:22 +04:00
Ilya Lavrenov
5864895ec6 fixed ocl::copyMakeBorder 2013-10-23 23:52:05 +04:00
konstantin
ebb2c3e01f try to fix build error 2013-10-23 23:18:21 +04:00
Ilya Lavrenov
7c1443cbdd fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0) 2013-10-23 22:13:18 +04:00
konstantin
2f62940a0e Added few opencl optimizations (as Intel platform codepath): 
1. HaarDetetctor: repack nodes to reduce memory footprint
2. cornerMinEigVal: 4 ocl kernels are fused into 1 for sobel calculation
 2013-10-23 20:38:11 +04:00
Ilya Lavrenov
29499ed51a moved to relative errors in ocl::norm tests 2013-10-23 19:53:04 +04:00
Ilya Lavrenov
87fc3441f2 workaround for cv::multiply bug 2013-10-23 18:42:55 +04:00
Roman Donchenko
424a7b0ab0 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
 2013-10-23 17:42:00 +04:00
Roman Donchenko
3f3ae33327 Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp. 
This should actually remove the need for the workaround from
the previous commit.
 2013-10-23 14:56:37 +04:00
Roman Donchenko
eb86d37b26 Removed some dubious FFmpeg hack that no longer works. 2013-10-23 14:56:37 +04:00
Vadim Pisarevsky
5a34272150 fixed build on Windows 2013-10-23 00:17:18 +04:00
Vadim Pisarevsky
de521fc9fa fixed some more compile bugs (including Python bindings) 2013-10-22 23:34:16 +04:00
Roman Donchenko
bb461fab34 Merge pull request #1649 from asandwhich:2.4 2013-10-22 19:16:09 +04:00
Vadim Pisarevsky
d3076c5014 hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors 2013-10-22 17:41:28 +04:00
Roman Donchenko
779acfa715 Suppressed -Wundef in bioinspired, because of OpenCL headers. 2013-10-22 15:16:22 +04:00
Roman Donchenko
4036f6a3d0 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
 2013-10-22 14:28:00 +04:00
Vadim Pisarevsky
d8c8339bec the first draft of transparent API and new UMat class. more files 2013-10-22 14:05:15 +04:00
Vadim Pisarevsky
278fb617d2 the first draft of transparent API and new UMat class. 2013-10-22 14:04:49 +04:00
Roman Donchenko
6640846e95 Merge pull request #1653 from jlblancoc:master 2013-10-22 13:53:12 +04:00
Roman Donchenko
1e556e08dc Merge pull request #1661 from look4pritam:my-branch 2013-10-22 13:45:25 +04:00
look4pritam
8c121d372a Small OpenCV-CUDA bugs are fixed. 2013-10-22 12:08:43 +05:30
Jose-Luis Blanco-Claraco
80e667b647 Minimized the number of arguments required to workaround the MSVC2013 compiler bug. 2013-10-21 21:43:26 +02:00
Jose-Luis Blanco-Claraco
77023e2366 Added comment to features2d_init.cpp explaining the reason for the extra parameters. 2013-10-21 21:17:15 +02:00
Alexander Alekhin
e7fd053478 ocl: fix FFT initialization 2013-10-21 19:48:36 +04:00
Alexander Alekhin
9acca12d2d ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error 2013-10-21 19:16:33 +04:00
Jose-Luis Blanco-Claraco
c33ca77838 Undo changing whitespace. 2013-10-21 15:59:26 +02:00
Jose-Luis Blanco-Claraco
bec35eeddb Avoid duplicated variable declarations. 2013-10-21 15:57:11 +02:00
Roman Donchenko
29f37fc130 Merge pull request #1575 from jet47:gpu-buffer-pool 2013-10-21 16:35:14 +04:00
Roman Donchenko
21233656bd Merge pull request #1540 from jet47:gpuarithm-cudev 2013-10-21 16:34:45 +04:00
Roman Donchenko
e290436a4c Merge pull request #1492 from jet47:gpucodec-cudev 2013-10-21 16:30:15 +04:00
Roman Donchenko
f25b77ff1e Merge pull request #1534 from jet47:fix-cuda-5.0-build 2013-10-21 16:29:37 +04:00
Andrey Pavlenko
aec7d9c1db Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative 2013-10-21 16:06:36 +04:00
Andrey Pavlenko
0ad04d66e3 Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix 2013-10-21 16:00:13 +04:00
Andrey Pavlenko
e82fd12a67 Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations 2013-10-21 15:59:19 +04:00
Andrey Pavlenko
bd1a1cc031 Merge pull request #1633 from ilya-lavrenov:ocl_imgproc 2013-10-21 15:59:00 +04:00
Ilya Lavrenov
9d923b50ac fixed ocl::Laplacian for case when scale != 1 2013-10-21 14:27:34 +04:00
Ilya Lavrenov
6085c416a7 missed initialization of kernel size 2013-10-21 14:27:14 +04:00
Roman Donchenko
599d51ec14 Merge pull request #1651 from ilya-lavrenov:misprint 2013-10-21 14:00:23 +04:00
peng xiao
7285341083 1. Let btvRegWeights to be constant per process call. 
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
 2013-10-21 10:21:37 +08:00
Jose-Luis Blanco-Claraco
52a904e17b Fixed MSVC 2013 build errors and workaround for an internal compiler crash. 2013-10-20 17:28:45 +02:00
Nghia Ho
2238e711b5 Copied errorCovPre to errorCovPost. This allows the correct behaviour of the uncertainty to grow when there is missing data for each predict step. 2013-10-20 13:00:11 +11:00
Ilya Lavrenov
4f68f35a78 added reflect, reflect101, replicate, wrap border types to ocl::remap 2013-10-19 23:38:50 +04:00
Ilya Lavrenov
bebc1c9330 misprint 2013-10-19 22:59:47 +04:00
Kevin
8f995fac88 Change intrinsic camera matrix initialization 
In the function cvInitIntrinsicParams2D the principal point for
normalized image coordinates is set to 0/0. This updates the function
to initialize the principal point at 0.5/0.5.
 2013-10-19 02:10:20 -05:00
Ilya Lavrenov
e9cef2990e made more demonstrative message about test fails 2013-10-19 01:17:46 +04:00
Andrey Pavlenko
d50f0d2ed2 Merge pull request #1587 from alalek:opencl_khronos_headers 2013-10-18 18:41:13 +04:00
Roman Donchenko
83b36dcbcf Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix 2013-10-18 18:39:08 +04:00
Roman Donchenko
d700cc60be Merge pull request #1641 from jet47:imshow-opengl-fix 2013-10-18 18:23:00 +04:00
Ilya Lavrenov
022b5d6c74 refactored ocl matrix operations accuracy tests 2013-10-18 17:36:38 +04:00
Ilya Lavrenov
b3e1a4598c enabled double in copyMakeBorder kernel 2013-10-18 16:46:51 +04:00
Ilya Lavrenov
2681cef5d7 rewrote ocl::remap 2013-10-18 16:41:09 +04:00
Ilya Lavrenov
3fe74ad124 fixed ocl::copyMakeBorder 2013-10-18 16:39:47 +04:00
Ilya Lavrenov
36342eb425 added ROI support to ocl::convolve 2013-10-18 16:36:11 +04:00
Ilya Lavrenov
110a92c126 added ROI support to ocl::columnSum 2013-10-18 16:33:48 +04:00
Ilya Lavrenov
60f9ba0c64 added ROI support to ocl::CLAHE 2013-10-18 16:31:52 +04:00
Ilya Lavrenov
4a81be7d0b refactored all the tests in ocl/test/test_imgproc.cpp 2013-10-18 16:29:10 +04:00
Alexander Alekhin
fd4e705b14 ocl: update autogenerated code 2013-10-18 15:47:11 +04:00
Alexander Alekhin
6344da9ac3 ocl: force to use Khronos OpenCL headers 2013-10-18 15:47:11 +04:00
Andrey Pavlenko
4cbf0cb31e Merge pull request #1640 from alalek:ocl_fix_exp_test 2013-10-18 13:45:12 +04:00
Andrey Pavlenko
97dfd65007 Merge pull request #1626 from ilya-lavrenov:ocl_filters 2013-10-18 13:44:41 +04:00
Vladislav Vinogradov
fa70f95272 fix imshow under Windows with OpenGL support: 
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
 2013-10-17 20:58:33 +04:00
Alexander Alekhin
4bfeeb0738 ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow 2013-10-17 19:00:36 +04:00
Roman Donchenko
578e984739 OpenCV 2.4.6.2 (Tegra detection and native camera update) 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iF4EABEIAAYFAlIxuvoACgkQdDiF7KIeJGrdaQEA0cMV6JhnsWSnZbRCd3RzyXD7
 8mf7qrSjIV9ty1UL9AMA/0d4iUIm/iEiBIEP0DbsshX+trN5kXsH5woriScbZMGS
 =WeoS
 -----END PGP SIGNATURE-----

Merge tag '2.4.6.2' into 2.4

OpenCV 2.4.6.2 (Tegra detection and native camera update)
 2013-10-17 17:19:04 +04:00
Roman Donchenko
fb7b4d2d60 Merge pull request #1636 from ilya-lavrenov:ocl_loop_times 2013-10-17 17:00:45 +04:00
Roman Donchenko
88cc054f10 Merge pull request #1369 from StevenPuttemans:fix_featuretracker 2013-10-17 15:42:38 +04:00
Ilya Lavrenov
07aee1a25c made LOOP_TIMES as a command line option with default value=1 2013-10-17 12:40:16 +04:00
Roman Donchenko
d411041c53 Merge pull request #1637 from SpecLad:run-py-java-fix 2013-10-17 12:25:31 +04:00
Ilya Lavrenov
da3b7c79b8 refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter 2013-10-17 12:23:56 +04:00
Andrey Pavlenko
7605426dc3 Merge pull request #1613 from alalek:ocl_cvtcolor 2013-10-17 12:07:20 +04:00
Alexander Alekhin
ce0647c9b6 ocl: rewrite CvtColor tests, added roi support 2013-10-16 22:46:21 +04:00
Roman Donchenko
5bb6949bd6 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.
 2013-10-16 19:22:01 +04:00
Alexander Alekhin
2a9d24323c cmake: add opencv_java into list of exported targets (fix for android) 2013-10-16 17:23:44 +04:00
lluis
b50185e160 Fix a bug in the er tree clean-up process (see discussion in https://github.com/Itseez/opencv/pull/1520). It's not necessary to walk the er tree in order to clean up the memory since it's possible to cleanup the regions in the stack just by iterating over the er_stack vector instead of walking the tree structure. This turns out to be safer because the tree structure of those regions may have been modified previously in er_save function. 2013-10-15 19:44:08 +02:00
Alexander Alekhin
e845184843 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
 2013-10-15 20:08:52 +04:00
Roman Donchenko
b420c0b160 Merge pull request #1630 from SpecLad:java-deprecated-assert 2013-10-15 18:36:15 +04:00
Roman Donchenko
a61d1e6494 Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x. 
We don't use it, anyway.
 2013-10-15 17:10:12 +04:00
Roman Donchenko
7ff91665cf 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.
 2013-10-15 15:44:26 +04:00
Roman Donchenko
7fb18a2311 Merge pull request #1620 from SpecLad:record-build-type 2013-10-15 14:59:53 +04:00
Ilya Lavrenov
741e0242b3 replaced to_string by cv::format 2013-10-15 13:26:01 +04:00
Roman Donchenko
cf71ff0845 Record OpenCV build type among the test properties. 
Because apparently I love running performance tests for debug builds.
 2013-10-15 12:09:31 +04:00
Roman Donchenko
1eb322fa5d Merge pull request #1622 from a0byte:2.4 2013-10-15 11:51:40 +04:00
Andrey Pavlenko
97da1419e1 Merge pull request #1573 from alalek:perf_simple_strategy 2013-10-14 19:28:49 +04:00
Andrey Pavlenko
7f15ec9d54 Merge pull request #1617 from ilya-lavrenov:ocl_info 2013-10-14 19:27:01 +04:00
Han Qiang
88f68a3fe0 Fixed typo in document. 
Signed-off-by: Han Qiang <a0byte@gmail.com>
 2013-10-14 23:23:59 +08:00
Ilya Lavrenov
ca26028415 demonstrative device info output 2013-10-14 17:18:25 +04:00
Andrey Pavlenko
9e12306d95 Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint 2013-10-14 16:43:18 +04:00
Andrey Pavlenko
e90a9e810d Merge pull request #1612 from alalek:ocl_fix_string_info 2013-10-14 16:41:43 +04:00
Andrey Pavlenko
ae56eaa563 Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization 2013-10-14 16:41:25 +04:00
Roman Donchenko
3f8db9d708 Merge pull request #1450 from adrians:neon-pull3 2013-10-14 15:08:37 +04:00
Ilya Lavrenov
28f566b843 misprint in disabling ocl::svm 2013-10-13 23:54:09 +04:00
Ilya Lavrenov
b18101b15a some optimization of binary ocl::bitwise operations 2013-10-13 23:25:59 +04:00
Ilya Lavrenov
da607c6711 ocl::cvtColor works with ROI properly 2013-10-13 23:09:14 +04:00
Alexander Alekhin
376cd8f84f perf: added simple collection strategy 2013-10-12 18:05:57 +04:00
Alexander Alekhin
f617c0d4a2 ocl: fix for get string info from OpenCL 2013-10-12 16:56:21 +04:00
Andrey Pavlenko
c5afaa4e8d Merge pull request #1610 from alalek:ocl_fix_perf_kalman 2013-10-12 16:31:02 +04:00
Andrey Pavlenko
19dca324ae Merge pull request #1608 from alalek:fix_warn_upd_haar 2013-10-12 16:24:04 +04:00
Andrey Pavlenko
f9fe1b9b09 Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup 2013-10-12 16:12:05 +04:00
Andrey Pavlenko
a55cc60136 Merge pull request #1606 from ilya-lavrenov:ocl_imgproc 2013-10-12 16:10:04 +04:00
Andrey Pavlenko
9f5cda799f Merge pull request #1602 from alalek:ocl_test_dump_info 2013-10-12 16:08:24 +04:00
Andrey Pavlenko
4e31a3df24 Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas 2013-10-12 16:04:05 +04:00
Kyrylo Shegeda
d37d46d279 Fix a typo in kernel size 2013-10-11 23:31:31 -04:00
Alexander Alekhin
4413bee693 ocl: reverted type of perf test params for Kalman filter 2013-10-12 02:36:53 +04:00
Ilya Lavrenov
dfbea3518a refactored ocl/src/imgproc.cpp 2013-10-11 23:39:41 +04:00
Ilya Lavrenov
5a309e8f6e fft cleanup ignoring 2013-10-11 20:25:03 +04:00
ilya-lavrenov
d63a38e9bf disable SVM when AMD BLAS is not available 2013-10-11 19:25:34 +04:00
Alexander Alekhin
723af15228 ocl: fix warnings from GCC 4.8, update Haar 2013-10-11 18:42:17 +04:00
Alexander Alekhin
1980aad8d7 ocl: dump device info in tests 2013-10-11 18:24:59 +04:00
Alexander Alekhin
3b0823db7e ocl: fix CV_EXPORTS usage (misplaced in functions declarations) 2013-10-11 18:07:38 +04:00
Alexander Alekhin
ce1177151e ocl: fix cleanup in static builds 2013-10-11 18:07:38 +04:00
Alexander Alekhin
57120c1a60 ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default) 2013-10-11 17:16:03 +04:00
ilya-lavrenov
ca32583fdd fixed ocl optical flow: sparse and tvl1 2013-10-11 13:55:49 +04:00
Andrey Pavlenko
171e0e62ec Merge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings 2013-10-11 12:40:12 +04:00
Andrey Pavlenko
b7f1edccfb Merge pull request #1595 from alalek:cl_code_cleanup 2013-10-11 12:37:42 +04:00
Alexander Alekhin
238550cdad ocl: code cleanup, fix .clb files 2013-10-11 01:19:46 +04:00
Andrey Pavlenko
dfbd5021fd Merge pull request #1598 from alalek:ocl_fix_build_mac 2013-10-11 00:40:06 +04:00
Ilya Lavrenov
1be77dd2f3 enabled accuracy tests for the functions that use inside AMD Blas/Fft 2013-10-11 00:37:52 +04:00
Alexander Alekhin
0760fdcbdb ocl: fix build on Mac 2013-10-10 23:11:48 +04:00
Ilya Lavrenov
1f51e6c0de fixed kernel compilation warnings on MacOSX 2013-10-10 22:56:39 +04:00
Adrian Stratulat
3561bc1bbc rename vBinOp64f to vBinOp64, minor fixups 2013-10-10 21:28:05 +03:00
Ilya Lavrenov
39c1e5ff73 added perf tests for min, max, abs 2013-10-10 21:54:38 +04:00
Andrey Pavlenko
ad1ba56fcf Merge pull request #1597 from alalek:ocl_fix_cleanup 2013-10-10 19:02:29 +04:00
Andrey Pavlenko
c820777967 Merge pull request #1596 from alalek:test_fix_run_py 2013-10-10 19:02:10 +04:00
Andrey Pavlenko
3b1c53fa8d Merge pull request #1551 from alalek:cmake_install_win 2013-10-10 18:20:35 +04:00
Alexander Alekhin
3eba2011b9 test: run.py: return valid errorCode in case of the single test run 2013-10-10 17:17:10 +04:00
Alexander Alekhin
6b9f74ae84 ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft) 2013-10-10 16:58:45 +04:00