Roman Donchenko [Wed, 16 Oct 2013 09:38:30 +0000 (13:38 +0400)]
Merge pull request #1631 from alalek:merge-2.4
Alexander Alekhin [Tue, 15 Oct 2013 14:43:37 +0000 (18:43 +0400)]
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
Andrey Pavlenko [Tue, 15 Oct 2013 10:42:44 +0000 (14:42 +0400)]
Merge pull request #1625 from ilya-lavrenov:to_string
Ilya Lavrenov [Tue, 15 Oct 2013 09:12:36 +0000 (13:12 +0400)]
replaced to_string by cv::format
Roman Donchenko [Tue, 15 Oct 2013 07:51:40 +0000 (11:51 +0400)]
Merge pull request #1622 from a0byte:2.4
Andrey Pavlenko [Mon, 14 Oct 2013 15:28:48 +0000 (19:28 +0400)]
Merge pull request #1573 from alalek:perf_simple_strategy
Andrey Pavlenko [Mon, 14 Oct 2013 15:27:00 +0000 (19:27 +0400)]
Merge pull request #1617 from ilya-lavrenov:ocl_info
Han Qiang [Mon, 14 Oct 2013 15:15:07 +0000 (23:15 +0800)]
Fixed typo in document.
Signed-off-by: Han Qiang <a0byte@gmail.com>
Ilya Lavrenov [Mon, 14 Oct 2013 07:58:45 +0000 (11:58 +0400)]
demonstrative device info output
Andrey Pavlenko [Mon, 14 Oct 2013 12:43:18 +0000 (16:43 +0400)]
Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint
Andrey Pavlenko [Mon, 14 Oct 2013 12:41:43 +0000 (16:41 +0400)]
Merge pull request #1612 from alalek:ocl_fix_string_info
Andrey Pavlenko [Mon, 14 Oct 2013 12:41:25 +0000 (16:41 +0400)]
Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization
Roman Donchenko [Mon, 14 Oct 2013 11:16:01 +0000 (15:16 +0400)]
Merge pull request #1616 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Mon, 14 Oct 2013 11:08:34 +0000 (15:08 +0400)]
Merge pull request #1450 from adrians:neon-pull3
Ilya Lavrenov [Sun, 13 Oct 2013 19:54:09 +0000 (23:54 +0400)]
misprint in disabling ocl::svm
Ilya Lavrenov [Fri, 11 Oct 2013 20:58:58 +0000 (00:58 +0400)]
some optimization of binary ocl::bitwise operations
Ilya Lavrenov [Sun, 13 Oct 2013 19:09:14 +0000 (23:09 +0400)]
ocl::cvtColor works with ROI properly
Alexander Alekhin [Sun, 6 Oct 2013 17:48:35 +0000 (21:48 +0400)]
perf: added simple collection strategy
Alexander Alekhin [Sat, 12 Oct 2013 12:53:02 +0000 (16:53 +0400)]
ocl: fix for get string info from OpenCL
Andrey Pavlenko [Sat, 12 Oct 2013 12:32:39 +0000 (16:32 +0400)]
Merge pull request #1611 from che-burashco:master
Andrey Pavlenko [Sat, 12 Oct 2013 12:31:02 +0000 (16:31 +0400)]
Merge pull request #1610 from alalek:ocl_fix_perf_kalman
Andrey Pavlenko [Sat, 12 Oct 2013 12:24:03 +0000 (16:24 +0400)]
Merge pull request #1608 from alalek:fix_warn_upd_haar
Andrey Pavlenko [Sat, 12 Oct 2013 12:12:05 +0000 (16:12 +0400)]
Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup
Andrey Pavlenko [Sat, 12 Oct 2013 12:10:03 +0000 (16:10 +0400)]
Merge pull request #1606 from ilya-lavrenov:ocl_imgproc
Andrey Pavlenko [Sat, 12 Oct 2013 12:08:24 +0000 (16:08 +0400)]
Merge pull request #1602 from alalek:ocl_test_dump_info
Andrey Pavlenko [Sat, 12 Oct 2013 12:04:05 +0000 (16:04 +0400)]
Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas
Kyrylo Shegeda [Sat, 12 Oct 2013 03:31:31 +0000 (23:31 -0400)]
Fix a typo in kernel size
Alexander Alekhin [Fri, 11 Oct 2013 22:36:53 +0000 (02:36 +0400)]
ocl: reverted type of perf test params for Kalman filter
Ilya Lavrenov [Fri, 11 Oct 2013 15:22:25 +0000 (19:22 +0400)]
refactored ocl/src/imgproc.cpp
Ilya Lavrenov [Fri, 11 Oct 2013 16:24:26 +0000 (20:24 +0400)]
fft cleanup ignoring
ilya-lavrenov [Fri, 11 Oct 2013 11:15:57 +0000 (15:15 +0400)]
disable SVM when AMD BLAS is not available
Andrey Pavlenko [Fri, 11 Oct 2013 14:55:53 +0000 (18:55 +0400)]
Merge pull request #1605 from alalek:ocl_fixes
Alexander Alekhin [Fri, 11 Oct 2013 14:42:17 +0000 (18:42 +0400)]
ocl: fix warnings from GCC 4.8, update Haar
Alexander Alekhin [Fri, 11 Oct 2013 14:24:59 +0000 (18:24 +0400)]
ocl: dump device info in tests
Alexander Alekhin [Fri, 11 Oct 2013 12:55:22 +0000 (16:55 +0400)]
ocl: fix CV_EXPORTS usage (misplaced in functions declarations)
Alexander Alekhin [Fri, 11 Oct 2013 12:39:26 +0000 (16:39 +0400)]
ocl: fix cleanup in static builds
Alexander Alekhin [Fri, 11 Oct 2013 11:33:10 +0000 (15:33 +0400)]
ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default)
Andrey Pavlenko [Fri, 11 Oct 2013 12:22:58 +0000 (16:22 +0400)]
Merge pull request #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
ilya-lavrenov [Fri, 11 Oct 2013 09:55:49 +0000 (13:55 +0400)]
fixed ocl optical flow: sparse and tvl1
Andrey Pavlenko [Fri, 11 Oct 2013 08:40:12 +0000 (12:40 +0400)]
Merge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
Andrey Pavlenko [Fri, 11 Oct 2013 08:37:41 +0000 (12:37 +0400)]
Merge pull request #1595 from alalek:cl_code_cleanup
Alexander Alekhin [Thu, 10 Oct 2013 21:16:12 +0000 (01:16 +0400)]
ocl: code cleanup, fix .clb files
Andrey Pavlenko [Thu, 10 Oct 2013 20:40:06 +0000 (00:40 +0400)]
Merge pull request #1598 from alalek:ocl_fix_build_mac
Andrey Pavlenko [Thu, 10 Oct 2013 20:38:12 +0000 (00:38 +0400)]
Merge pull request #1594 from ilya-lavrenov:ocl_perf
Ilya Lavrenov [Thu, 10 Oct 2013 20:00:01 +0000 (00:00 +0400)]
enabled accuracy tests for the functions that use inside AMD Blas/Fft
Alexander Alekhin [Thu, 10 Oct 2013 18:56:19 +0000 (22:56 +0400)]
ocl: fix build on Mac
Ilya Lavrenov [Thu, 10 Oct 2013 18:28:09 +0000 (22:28 +0400)]
fixed kernel compilation warnings on MacOSX
Adrian Stratulat [Thu, 10 Oct 2013 18:28:05 +0000 (21:28 +0300)]
rename vBinOp64f to vBinOp64, minor fixups
Ilya Lavrenov [Wed, 9 Oct 2013 15:37:09 +0000 (19:37 +0400)]
added perf tests for min, max, abs
Andrey Pavlenko [Thu, 10 Oct 2013 15:02:29 +0000 (19:02 +0400)]
Merge pull request #1597 from alalek:ocl_fix_cleanup
Andrey Pavlenko [Thu, 10 Oct 2013 15:02:10 +0000 (19:02 +0400)]
Merge pull request #1596 from alalek:test_fix_run_py
Andrey Pavlenko [Thu, 10 Oct 2013 14:20:34 +0000 (18:20 +0400)]
Merge pull request #1551 from alalek:cmake_install_win
Alexander Alekhin [Sun, 6 Oct 2013 17:34:44 +0000 (21:34 +0400)]
test: run.py: return valid errorCode in case of the single test run
Alexander Alekhin [Sun, 6 Oct 2013 10:34:36 +0000 (14:34 +0400)]
ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft)
Adrian Stratulat [Sat, 14 Sep 2013 12:12:20 +0000 (15:12 +0300)]
Refactor vectorized arithmetical operations
Andrey Pavlenko [Thu, 10 Oct 2013 11:55:58 +0000 (15:55 +0400)]
Merge pull request #1592 from alalek:ocl_program_cache_update
Andrey Pavlenko [Thu, 10 Oct 2013 11:55:12 +0000 (15:55 +0400)]
Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h
Andrey Pavlenko [Thu, 10 Oct 2013 11:54:07 +0000 (15:54 +0400)]
Merge pull request #1593 from ilya-lavrenov:ocl_war_on_double
Ilya Lavrenov [Wed, 9 Oct 2013 14:05:09 +0000 (18:05 +0400)]
catching OpenCL double not supported exceptions
Alexander Alekhin [Wed, 9 Oct 2013 12:57:52 +0000 (16:57 +0400)]
ocl: fix compilation warnings, update openCLExecuteKernelInterop
Alexander Alekhin [Wed, 9 Oct 2013 15:17:20 +0000 (19:17 +0400)]
ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms)
Alexander Alekhin [Wed, 9 Oct 2013 14:29:03 +0000 (18:29 +0400)]
cmake: export OpenCVModules for unix 'install', move macros desclarations
Alexander Alekhin [Fri, 4 Oct 2013 13:48:43 +0000 (17:48 +0400)]
cmake: update java module install rules
Alexander Alekhin [Fri, 4 Oct 2013 13:15:02 +0000 (17:15 +0400)]
cmake: python module updates
Alexander Alekhin [Fri, 4 Oct 2013 13:04:10 +0000 (17:04 +0400)]
cmake: update install rules for doc
Alexander Alekhin [Thu, 3 Oct 2013 15:27:57 +0000 (19:27 +0400)]
cmake: OpenCVConfig.cmake: fix message
Alexander Alekhin [Thu, 3 Oct 2013 14:48:07 +0000 (18:48 +0400)]
cmake: revert CRT linkage option for MSVS
Alexander Alekhin [Wed, 2 Oct 2013 22:20:54 +0000 (02:20 +0400)]
cmake: workaround for dependencies resolver (bypass non-module deps w/o check)
ilya-lavrenov [Wed, 4 Sep 2013 14:32:05 +0000 (18:32 +0400)]
fixed warning on windows
Alexander Alekhin [Wed, 7 Aug 2013 08:53:48 +0000 (12:53 +0400)]
update cmake 'install' target for Windows platform
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
Andrey Pavlenko [Wed, 9 Oct 2013 12:47:59 +0000 (16:47 +0400)]
Merge pull request #1589 from ilya-lavrenov:pr1582_fix
Ilya Lavrenov [Wed, 9 Oct 2013 10:18:07 +0000 (14:18 +0400)]
changes eps for NORM_L1
Ilya Lavrenov [Wed, 9 Oct 2013 10:07:24 +0000 (14:07 +0400)]
fixed the PR 1582
Andrey Pavlenko [Wed, 9 Oct 2013 09:52:20 +0000 (13:52 +0400)]
Merge pull request #1579 from ilya-lavrenov:ocl_norm
Andrey Pavlenko [Wed, 9 Oct 2013 09:49:34 +0000 (13:49 +0400)]
Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix
Roman Donchenko [Wed, 9 Oct 2013 09:45:40 +0000 (13:45 +0400)]
Merge pull request #1583 from SpecLad:name-enum-2
Roman Donchenko [Wed, 9 Oct 2013 08:36:01 +0000 (12:36 +0400)]
Merge pull request #1582 from sperrholz:ocl-arithm-additions
Roman Donchenko [Wed, 9 Oct 2013 08:33:49 +0000 (12:33 +0400)]
Merge pull request #1581 from SpecLad:merge-2.4
Alexander Alekhin [Tue, 8 Oct 2013 15:13:10 +0000 (19:13 +0400)]
ocl: fix CL_RUNTIME_EXPORT for master branch
Ilya Lavrenov [Tue, 8 Oct 2013 14:25:40 +0000 (18:25 +0400)]
ocl setto fix for windows
Ilya Lavrenov [Tue, 8 Oct 2013 14:25:40 +0000 (18:25 +0400)]
ocl setto fix for windows
Sebastian Krämer [Tue, 8 Oct 2013 14:49:20 +0000 (16:49 +0200)]
fix documentation warning
Ilya Lavrenov [Tue, 8 Oct 2013 12:02:47 +0000 (16:02 +0400)]
fixed ocl::norm (previously the function used double as a work type)
Roman Donchenko [Tue, 8 Oct 2013 14:13:56 +0000 (18:13 +0400)]
Named GraphCutSeamFinderBase to allow its usage in makePtr.
Sequel to
bcb6f038.
Roman Donchenko [Tue, 8 Oct 2013 13:21:42 +0000 (17:21 +0400)]
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
Sebastian Krämer [Tue, 8 Oct 2013 13:16:30 +0000 (15:16 +0200)]
add ocl::abs
Sebastian Krämer [Mon, 7 Oct 2013 13:51:01 +0000 (15:51 +0200)]
documentation update for ocl::min and ocl::max
Sebastian Krämer [Mon, 7 Oct 2013 13:41:50 +0000 (15:41 +0200)]
add ocl::min and ocl::max (includes accuracy tests update)
Roman Donchenko [Tue, 8 Oct 2013 11:31:42 +0000 (15:31 +0400)]
Merge pull request #1574 from alalek:svm_workaround
Roman Donchenko [Tue, 8 Oct 2013 11:14:38 +0000 (15:14 +0400)]
Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12
Roman Donchenko [Tue, 8 Oct 2013 10:20:11 +0000 (14:20 +0400)]
Merge pull request #1576 from alalek:ocl_fix_cl_double
Roman Donchenko [Tue, 8 Oct 2013 09:50:49 +0000 (13:50 +0400)]
Merge pull request #1567 from ilya-lavrenov:warn_fix
Roman Donchenko [Tue, 8 Oct 2013 09:00:38 +0000 (13:00 +0400)]
Merge pull request #1538 from StevenPuttemans:bugfix_3283
Roman Donchenko [Tue, 8 Oct 2013 08:59:49 +0000 (12:59 +0400)]
Merge pull request #1545 from alalek:ocl_test_fix_rng
Ilya Lavrenov [Mon, 7 Oct 2013 18:10:11 +0000 (22:10 +0400)]
enabled OpenCL 1.2 branch in oclMat::setTo
Ilya Lavrenov [Fri, 4 Oct 2013 13:03:15 +0000 (17:03 +0400)]
fixed warnings
Roman Donchenko [Tue, 8 Oct 2013 08:32:57 +0000 (12:32 +0400)]
Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix
Alexander Alekhin [Mon, 7 Oct 2013 17:01:33 +0000 (21:01 +0400)]
ocl: fix Context::CL_* usage
Roman Donchenko [Tue, 8 Oct 2013 08:22:14 +0000 (12:22 +0400)]
Merge pull request #1578 from asmorkalov:android_fd_cp_fix
Alexander Smorkalov [Tue, 8 Oct 2013 06:28:24 +0000 (10:28 +0400)]
Invalid copy-passed exception messages in FaceDetect sample for Android fixed.
projects / profile / ivi / opencv.git / log