586 Commits

Author SHA1 Message Date
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
Alexander Alekhin
9e527fc9f4 ocl: Canny: replace unsafe buffer to oclMat 2013-10-27 18:55:42 +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
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
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
yao
dd0fa63ca8 fix the bug of ocl::bruteForceMatcher 2013-10-25 16:01:41 +08:00
Roman Donchenko
3b08bf6b62 Merge pull request #1682 from SpecLad:Wmissing-declarations 2013-10-24 22:19:17 +04:00
Roman Donchenko
f51e490bad Fixed a Wmissing-declarations warning when compiling with MinGW. 2013-10-24 18:35:08 +04:00
Ilya Lavrenov
dab3000778 fixed bug in ocl::equalizeHist 2013-10-24 13:59:25 +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
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
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
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
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
Andrey Pavlenko
0ad04d66e3 Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix 2013-10-21 16:00:13 +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
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
Ilya Lavrenov
4f68f35a78 added reflect, reflect101, replicate, wrap border types to ocl::remap 2013-10-19 23:38:50 +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
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
97dfd65007 Merge pull request #1626 from ilya-lavrenov:ocl_filters 2013-10-18 13:44:41 +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
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