mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,028 Commits 6 Branches 126 Tags 3 GiB
d0b3c7a518
Commit Graph

7823 Commits

Author SHA1 Message Date
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
Adrian Stratulat
cb445d697c Refactor vectorized arithmetical operations 2013-10-10 15:52:48 +03:00
Andrey Pavlenko
d5723480e1 Merge pull request #1592 from alalek:ocl_program_cache_update 2013-10-10 15:55:58 +04:00
Andrey Pavlenko
a351161fd7 Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h 2013-10-10 15:55:13 +04:00
Ilya Lavrenov
9d1636daa6 catching OpenCL double not supported exceptions 2013-10-10 12:45:55 +04:00
Alexander Alekhin
d26f62569d ocl: fix compilation warnings, update openCLExecuteKernelInterop 2013-10-10 00:15:02 +04:00
Alexander Alekhin
43c638d07d ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms) 2013-10-09 23:53:25 +04:00
Alexander Alekhin
bc089bb18c cmake: update java module install rules 2013-10-09 17:49:11 +04:00
Alexander Alekhin
4adede4246 cmake: python module updates 2013-10-09 17:49:11 +04:00
Alexander Alekhin
555c505b70 update cmake 'install' target for Windows platform 
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
 2013-10-09 17:49:10 +04:00
Ilya Lavrenov
fccd37de7e changes eps for NORM_L1 2013-10-09 14:18:07 +04:00
Ilya Lavrenov
488e6aafaf fixed the PR 1582 2013-10-09 14:16:36 +04:00
Andrey Pavlenko
6b69a66c3c Merge pull request #1579 from ilya-lavrenov:ocl_norm 2013-10-09 13:52:20 +04:00
Andrey Pavlenko
ff8e5a04a4 Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix 2013-10-09 13:49:34 +04:00
Roman Donchenko
3d4ec7ad98 Merge pull request #1583 from SpecLad:name-enum-2 2013-10-09 13:45:40 +04:00
Roman Donchenko
dfb698dc64 Merge pull request #1581 from SpecLad:merge-2.4 2013-10-09 12:33:50 +04:00
Alexander Alekhin
076eeffd4d ocl: fix CL_RUNTIME_EXPORT for master branch 2013-10-08 19:13:58 +04:00
Ilya Lavrenov
245ff93544 ocl setto fix for windows 2013-10-08 19:11:32 +04:00
Ilya Lavrenov
bdd5038da4 ocl setto fix for windows 2013-10-08 18:52:32 +04:00
Sebastian Krmer
3696174b14 fix documentation warning 2013-10-08 16:49:20 +02:00
Ilya Lavrenov
c404da784f fixed ocl::norm (previously the function used double as a work type) 2013-10-08 18:43:49 +04:00
Roman Donchenko
cc7a13ea57 Named GraphCutSeamFinderBase to allow its usage in makePtr. 
Sequel to bcb6f038.
 2013-10-08 18:13:56 +04:00
Roman Donchenko
f07769e9d8 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectOpenCL.cmake
	cmake/OpenCVModule.cmake
	modules/imgproc/src/floodfill.cpp
	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/blend.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_programcache.hpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/mssegmentation.cpp
	modules/ocl/src/precomp.hpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/stereo_csbp.cpp
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/main.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/stereo_match.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp
 2013-10-08 17:57:23 +04:00
Sebastian Krämer
4ffd3fb905 add ocl::abs 2013-10-08 15:23:24 +02:00
Sebastian Krämer
c844bbdd82 documentation update for ocl::min and ocl::max 2013-10-08 15:23:18 +02:00
Sebastian Krämer
33df7131ae add ocl::min and ocl::max (includes accuracy tests update) 2013-10-08 15:23:13 +02:00
Vladislav Vinogradov
342e007dc6 now Allocator accepts GpuMat* instead of 3 pointers 2013-10-08 17:21:25 +04:00
Vladislav Vinogradov
3b412b51ac moved BufferPool management functions to public 2013-10-08 17:21:22 +04:00
Vladislav Vinogradov
5ea8085220 added BufferPool class 2013-10-08 17:20:29 +04:00
Vladislav Vinogradov
988ab79acb added BufferAllocator 2013-10-08 17:20:20 +04:00
Roman Donchenko
ae851af648 Merge pull request #1574 from alalek:svm_workaround 2013-10-08 15:31:42 +04:00
Roman Donchenko
65ec9f77d9 Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12 2013-10-08 15:15:31 +04:00
Roman Donchenko
bc3669bfb1 Merge pull request #1576 from alalek:ocl_fix_cl_double 2013-10-08 14:20:11 +04:00
Roman Donchenko
685eceb68a Merge pull request #1567 from ilya-lavrenov:warn_fix 2013-10-08 13:50:49 +04:00
Roman Donchenko
895308a811 Merge pull request #1538 from StevenPuttemans:bugfix_3283 2013-10-08 13:00:39 +04:00
Roman Donchenko
ec409a436d Merge pull request #1545 from alalek:ocl_test_fix_rng 2013-10-08 12:59:50 +04:00
Ilya Lavrenov
32f11e6f40 enabled OpenCL 1.2 branch in oclMat::setTo 2013-10-08 12:49:29 +04:00
Ilya Lavrenov
35d9ce0c0c fixed warnings 2013-10-08 12:46:43 +04:00
Roman Donchenko
95b3a344d9 Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix 2013-10-08 12:32:57 +04:00
Alexander Alekhin
1d6327ba2a ocl: fix Context::CL_* usage 2013-10-08 12:23:46 +04:00
Alexander Alekhin
f63b0dfaf4 svm: disable failed tests 2013-10-07 18:17:10 +04:00
Roman Donchenko
b08233a3ca Merge pull request #1569 from ilya-lavrenov:ocl_hough_circles 2013-10-07 17:47:41 +04:00
Roman Donchenko
920e15b41d Merge pull request #1572 from emchristiansen:includeLimits 2013-10-07 16:59:24 +04:00
Roman Donchenko
f91f8663b6 Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk 2013-10-07 15:53:20 +04:00
Roman Donchenko
801054d611 Merge pull request #1566 from SpecLad:Wshadow-openni 2013-10-07 15:48:40 +04:00
Vladislav Vinogradov
e5188c7e94 added GpuMat::Allocator interface 2013-10-07 09:42:43 +04:00
Greg Hale
88b1847d09 add include limits, for compilers that dont add it implicitly 2013-10-06 01:21:43 -04:00
Eric Martin Christiansen
c8a3a85e26 adds include to fix build 2013-10-05 15:52:19 -07:00
Ilya Lavrenov
036e99d03a fixed ipp-related warnings 2013-10-05 14:54:00 +04:00
Ilya Lavrenov
8c82decf5b added plain branch to HoughCircle perf test 2013-10-04 19:51:26 +04:00
Roman Donchenko
46eeb106e2 Merge pull request #1564 from alalek:cl_runtime_fix_32bit 2013-10-04 18:29:04 +04:00
Roman Donchenko
0a13510293 Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update 2013-10-04 18:25:44 +04:00
Ilya Lavrenov
72c35d3a89 fixed mog2 2013-10-04 18:19:01 +04:00
Roman Donchenko
744f4b1609 Merge pull request #1565 from SpecLad:cmake-new-ptr 2013-10-04 18:14:34 +04:00
Roman Donchenko
2660f4bc59 Merge pull request #1562 from ilya-lavrenov:ocl_integral 2013-10-04 18:12:43 +04:00
Ilya Lavrenov
fb73e7b4bd fixed pyrlk optical flow 2013-10-04 17:56:02 +04:00
Roman Donchenko
aa80250a3d Merge pull request #1532 from alalek:stereo_csbp 2013-10-04 16:43:51 +04:00
Roman Donchenko
cca2e5d8b1 Merge pull request #1536 from asmorkalov:android_ndk_r9_master 2013-10-04 16:36:44 +04:00
Roman Donchenko
1b51270617 Merge pull request #1558 from SpecLad:Wparentheses-equality 2013-10-04 16:32:09 +04:00
Roman Donchenko
f04cade607 Merge pull request #1559 from SpecLad:Wnull-conversion 2013-10-04 16:08:54 +04:00
Alexander Alekhin
de0f310e81 ocl: tests: RNG usage refactoring 2013-10-04 15:39:39 +04:00
Roman Donchenko
3cfad385ec Fix a -Wshadow warning in cap_openni.cpp. 2013-10-04 14:23:06 +04:00
Roman Donchenko
ca65fe4548 Merge pull request #1535 from asmorkalov:android_ndk_r9 2013-10-04 14:14:20 +04:00
Roman Donchenko
b03c19a8ac Merge pull request #1554 from pablospe:fix_viz_module_compilation 2013-10-04 14:02:17 +04:00
Roman Donchenko
32630dbf61 Adapt cap_openni.cpp to the new Ptr. 2013-10-04 13:51:58 +04:00
StevenPuttemans
2f474db27f Fix of bug #3283 and bug #3301 
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
 2013-10-04 11:19:45 +02:00
Alexander Alekhin
90df620deb ocl: stereo_csbp: divUp -> roundUp 2013-10-04 12:48:26 +04:00
Alexander Alekhin
2d1a6687f9 autogenerated code 2013-10-04 12:40:08 +04:00
Alexander Alekhin
2fdfa37ea5 ocl: runtime, fix 32-bit builds 2013-10-04 12:40:08 +04:00
Ilya Lavrenov
10d60f99dc fixed ocl::integral and enabled perf test for it 2013-10-04 12:33:14 +04:00
Ilya Lavrenov
5f81988699 refactored arithm binary operations in order to make them more scalable 2013-10-04 12:13:22 +04:00
Alexander Alekhin
d74ca7b39d ocl: update module documentation 2013-10-03 23:26:06 +04:00
Alexander Alekhin
7f0680fc8b ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp 2013-10-03 23:26:06 +04:00
Alexander Alekhin
8beb514ecf ocl: merge with upstream/2.4 2013-10-03 23:26:06 +04:00
Alexander Alekhin
16adbda4d3 ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable 2013-10-03 19:50:14 +04:00
Alexander Alekhin
dd9ff587dc ocl: file-based ProgramCache refactoring 2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f ocl: move program names into opencl_kernels.hpp 2013-10-03 19:50:14 +04:00
Alexander Alekhin
e8d9ed8955 ocl: split initialization.cpp into 3 files: context, operations, programcache 2013-10-03 19:50:14 +04:00
Ilya Lavrenov
dafd4da031 removed ocl::minMax_buf, updated doc (operation on matrices) 2013-10-03 18:19:15 +04:00
Roman Donchenko
1817a07a5e Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp. 2013-10-03 12:11:50 +04:00
Roman Donchenko
fa9d092c43 Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp. 2013-10-03 12:04:57 +04:00
Roman Donchenko
a1e239d2bf Merge pull request #1527 from vpisarev:shape_module 2013-10-03 11:54:41 +04:00
Alexander Smorkalov
1aaeb52a4c Android NDK r9 support. x64 NDK support fix for MacOS X. 2013-10-03 11:36:12 +04:00
Alexander Smorkalov
ccb48ddee0 Android NDK r9 support. x64 NDK support fix for MacOS X. 2013-10-03 11:23:50 +04:00
Ilya Lavrenov
adca219f18 fixed convertC3C4 and convertC4C3 functions in case cols == 1 2013-10-03 10:45:15 +04:00
Pablo Speciale
f47afe5799 Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297) 2013-10-03 02:10:27 +02:00
Andrey Pavlenko
88419f8923 Merge pull request #1507 from pengx17:2.4_fix_test 2013-10-02 19:52:12 +04:00
Andrey Pavlenko
73744904a2 Merge pull request #1542 from alalek:cl_runtime 2013-10-02 19:50:35 +04:00
Alexander Alekhin
12eb340a4e removed invalid comment 2013-10-02 19:35:21 +04:00
Roman Donchenko
447e03bc28 Merge pull request #1543 from SpecLad:name-enum 2013-10-02 19:22:35 +04:00
Andrey Pavlenko
b396916cdb Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm 2013-10-02 19:14:16 +04:00
Andrey Pavlenko
b2fe053f4d Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not 2013-10-02 19:14:00 +04:00
Alexander Alekhin
5ab49c4cc2 ocl: cl_runtime: added autogenerated code 2013-10-02 18:32:33 +04:00
Alexander Alekhin
212ad97100 ocl: dynamic load of OpenCL libraries 
Support functions from OpenCL 1.1 / OpenCL 1.2
 2013-10-02 18:32:33 +04:00
Ilya Lavrenov
e8b93040d6 enabled ocl::norm perf test 2013-10-02 16:57:15 +04:00
Roman Donchenko
d019344c9d Merge pull request #1547 from SpecLad:gtest-1.7 2013-10-02 16:46:19 +04:00
Roman Donchenko
58da54cb7a Cherry-picked mariusmuja/flann@8c8b0e0cb8. 
Original author: me.
 2013-10-02 16:09:45 +04:00
Ilya Lavrenov
a613a1a1da fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2 2013-10-02 16:09:29 +04:00
Roman Donchenko
4c19e0273a Cherry-picked mariusmuja/flann@b615f26947. 
Original author: Alex Wilson.
 2013-10-02 16:06:56 +04:00
Roman Donchenko
78c4ffec99 Revert "Fixed a bug in FLANN resulting in uninitialized accesses." 
This reverts commit a9975b144a, to prepare
for cherry-picking upstream's solution.
 2013-10-02 16:02:11 +04:00
Roman Donchenko
e65eb4e042 Updated Google Test to 1.7.0. 2013-10-02 14:41:00 +04:00
Roman Donchenko
30d7e1c33d Merge remote-tracking branch 'origin/master' into merge-2.4 
Conflicts:
	doc/tutorials/bioinspired/retina_model/retina_model.rst~
 2013-10-02 13:37:33 +04:00
Roman Donchenko
4c7ecf20d8 Merge pull request #1529 from vpisarev:polyfit_accuracy_2 2013-10-02 12:52:33 +04:00
Roman Donchenko
1ac1b9ae35 Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
Andrey Pavlenko
75d89f4331 Merge pull request #1533 from alalek:perf_test_update_relative_error_message 2013-10-01 20:17:52 +04:00
Andrey Pavlenko
154fe4f657 Merge pull request #1519 from ilya-lavrenov:ocl_minMax 2013-10-01 20:16:48 +04:00
Roman Donchenko
184ae873d4 Merge pull request #1526 from vpisarev:linedetector_python 2013-10-01 19:49:17 +04:00
Roman Donchenko
bcb6f0386e Named FastFeatureDetector::Type to allow its use in makePtr. 
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278>.
 2013-10-01 18:22:03 +04:00
Ilya Lavrenov
4322c47bb2 removed test_norm.cpp from ocl tests 2013-10-01 17:53:14 +04:00
Roman Donchenko
6133aeede8 Merge branch 'master' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
 2013-10-01 17:37:05 +04:00
Alexander Alekhin
a8ac3ec72a ocl: perf test: disable MOG2 (random hungs), enable upload/download 2013-10-01 16:49:11 +04:00
Alexander Alekhin
66e4aead97 perf tests: added SANITY_CHECK_NOTHING() 2013-10-01 16:49:11 +04:00
Roman Donchenko
81eb4bd8be Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp
 2013-10-01 15:57:33 +04:00
Vladislav Vinogradov
8ed47c01b7 used new device layer for cv::cuda::norm 2013-10-01 15:28:51 +04:00
Vladislav Vinogradov
23cc31e041 used new device layer for cv::cuda::LUT 2013-10-01 15:24:17 +04:00
Nghia Ho
61f5176bad Removed trailing whitespace 2013-10-01 21:03:54 +10:00
Nghia Ho
d7bf71c24a Merge remote-tracking branch 'upstream/master' 2013-10-01 19:56:47 +10:00
Ilya Lavrenov
065b40c6c3 fixed and extended ocl::norm 2013-10-01 13:21:43 +04:00
Vladislav Vinogradov
06f07944c8 removed dependecy from cudalegacy 2013-10-01 12:18:40 +04:00
Vladislav Vinogradov
7839dbd2c4 used new device layer for cv::gpu::integral 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
224f18b06c bitwise operation optimization 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
eb449968b6 removed unroll_detail.hpp 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
1ef211b889 used new device layer for cv::gpu::reduce 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
31a7814395 used new device layer for cv::gpu::countNonZero 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
020624c481 used new device layer for cv::gpu::minMaxLoc 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
e1aa2fd06c added gridMinMaxLoc function 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
3fb9c52272 cast to reference 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
bbd519be42 fixed warnings 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
045a856c24 used new device layer for cv::gpu::minMax 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
b705e0d886 used new device layer for cv::gpu::sum 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
9fe92e2111 renamed grid/glob_reduce.hpp -> grid/reduce.hpp 2013-10-01 12:18:38 +04:00