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
Andrey Pavlenko
14c3560750
Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix
2013-11-05 23:49:12 +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
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
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
a8426e1c12
fixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests
2013-11-04 15:16:00 +04:00
Andrey Pavlenko
dd942df08b
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access
2013-11-01 18:37:35 +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
Alexander Alekhin
3b293d6855
ocl: fix testdata for blendLinear
2013-11-01 14:44:13 +04:00
Andrey Pavlenko
e80f5bed2d
Merge pull request #1710 from melody-rain:2.4_moments_ocl
2013-10-31 13:54:46 +04:00
Andrey Pavlenko
ef9f690598
Merge pull request #1709 from ilya-lavrenov:ocl_cornerharris
2013-10-31 00:22:37 +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
Alexander Alekhin
0104f59feb
ocl: filter2D: fix processing of kernel with double datatype
2013-10-30 16:27:46 +04:00
Ilya Lavrenov
8dfde47f89
changed eps in ocl::GaussianBlur test
2013-10-30 16:04:48 +04:00
Alexander Alekhin
50d2c1066b
ocl: split: update tests and implementation
2013-10-30 14:08:37 +04: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
Jin Ma
b6b190df5c
Rewrote moments of opencl version.
2013-10-29 18:05:29 +08:00
Andrey Pavlenko
c6a01f2641
Merge pull request #1688 from alalek:ocl_fix_filters
2013-10-29 11:05:10 +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
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
Alexander Alekhin
0f95f0d8b3
ocl: rewrite filter2D
2013-10-28 20:09:49 +04:00
Alexander Alekhin
cb6ea8bfa1
ocl: update filter tests
2013-10-28 20:09:49 +04:00
Andrey Pavlenko
bb15c00665
Merge pull request #1703 from bitwangyaoyao:2.4_fix1480
2013-10-28 19:01:51 +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
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
Ilya Lavrenov
839245e420
fixed tests for ocl::warpAffine and ocl::warpPerspective
2013-10-27 14:49:37 +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
2b6fca68bf
fixing typo
2013-10-25 18:00:46 +04:00
Ilya Lavrenov
b33a62beb0
fixed separable filter extrapolation
2013-10-25 17:08:44 +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
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
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
Alexander Alekhin
133d889e33
ocl: show diff
2013-10-24 03:44:56 +04:00
Ilya Lavrenov
5864895ec6
fixed ocl::copyMakeBorder
2013-10-23 23:52:05 +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
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
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
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
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
Ilya Lavrenov
4f68f35a78
added reflect, reflect101, replicate, wrap border types to ocl::remap
2013-10-19 23:38:50 +04:00
Ilya Lavrenov
e9cef2990e
made more demonstrative message about test fails
2013-10-19 01:17:46 +04:00
Ilya Lavrenov
022b5d6c74
refactored ocl matrix operations accuracy tests
2013-10-18 17:36:38 +04:00
Ilya Lavrenov
3fe74ad124
fixed ocl::copyMakeBorder
2013-10-18 16:39:47 +04:00
Ilya Lavrenov
4a81be7d0b
refactored all the tests in ocl/test/test_imgproc.cpp
2013-10-18 16:29:10 +04:00
Andrey Pavlenko
97dfd65007
Merge pull request #1626 from ilya-lavrenov:ocl_filters
2013-10-18 13:44:41 +04:00
Roman Donchenko
fb7b4d2d60
Merge pull request #1636 from ilya-lavrenov:ocl_loop_times
2013-10-17 17:00:45 +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
Ilya Lavrenov
da3b7c79b8
refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter
2013-10-17 12:23:56 +04:00
Alexander Alekhin
ce0647c9b6
ocl: rewrite CvtColor tests, added roi support
2013-10-16 22:46:21 +04: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
Ilya Lavrenov
28f566b843
misprint in disabling ocl::svm
2013-10-13 23:54:09 +04:00
Andrey Pavlenko
9f5cda799f
Merge pull request #1602 from alalek:ocl_test_dump_info
2013-10-12 16:08:24 +04:00
ilya-lavrenov
d63a38e9bf
disable SVM when AMD BLAS is not available
2013-10-11 19:25:34 +04:00
Alexander Alekhin
1980aad8d7
ocl: dump device info in tests
2013-10-11 18:24:59 +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
Andrey Pavlenko
d5723480e1
Merge pull request #1592 from alalek:ocl_program_cache_update
2013-10-10 15:55:58 +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
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
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
33df7131ae
add ocl::min and ocl::max (includes accuracy tests update)
2013-10-08 15:23:13 +02:00
Roman Donchenko
ae851af648
Merge pull request #1574 from alalek:svm_workaround
2013-10-08 15:31:42 +04:00
Roman Donchenko
ec409a436d
Merge pull request #1545 from alalek:ocl_test_fix_rng
2013-10-08 12:59:50 +04:00
Alexander Alekhin
f63b0dfaf4
svm: disable failed tests
2013-10-07 18:17:10 +04:00
Ilya Lavrenov
72c35d3a89
fixed mog2
2013-10-04 18:19:01 +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
Alexander Alekhin
de0f310e81
ocl: tests: RNG usage refactoring
2013-10-04 15:39:39 +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
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
e8d9ed8955
ocl: split initialization.cpp into 3 files: context, operations, programcache
2013-10-03 19:50:14 +04:00
Ilya Lavrenov
adca219f18
fixed convertC3C4 and convertC4C3 functions in case cols == 1
2013-10-03 10:45:15 +04:00
Andrey Pavlenko
88419f8923
Merge pull request #1507 from pengx17:2.4_fix_test
2013-10-02 19:52:12 +04:00