profile/ivi/opencv.git
11 years agocmake: add opencv_java into list of exported targets (fix for android)
Alexander Alekhin [Wed, 16 Oct 2013 13:23:44 +0000 (17:23 +0400)]
cmake: add opencv_java into list of exported targets (fix for android)

11 years agoMerge pull request #1375 from jet47:gpu-examples-build
Roman Donchenko [Wed, 16 Oct 2013 09:22:25 +0000 (13:22 +0400)]
Merge pull request #1375 from jet47:gpu-examples-build

11 years agoMerge pull request #1630 from SpecLad:java-deprecated-assert
Roman Donchenko [Tue, 15 Oct 2013 14:36:15 +0000 (18:36 +0400)]
Merge pull request #1630 from SpecLad:java-deprecated-assert

11 years agoMerge pull request #1627 from SpecLad:java-version-no-inline
Roman Donchenko [Tue, 15 Oct 2013 14:05:58 +0000 (18:05 +0400)]
Merge pull request #1627 from SpecLad:java-version-no-inline

11 years agoDelete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.
Roman Donchenko [Tue, 15 Oct 2013 13:10:12 +0000 (17:10 +0400)]
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.

We don't use it, anyway.

11 years agoIn Java bindings, wrap version constants into functions to prevent inlining.
Roman Donchenko [Tue, 15 Oct 2013 11:44:26 +0000 (15:44 +0400)]
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.

11 years agoMerge pull request #1620 from SpecLad:record-build-type
Roman Donchenko [Tue, 15 Oct 2013 10:59:53 +0000 (14:59 +0400)]
Merge pull request #1620 from SpecLad:record-build-type

11 years agoMerge pull request #1625 from ilya-lavrenov:to_string
Andrey Pavlenko [Tue, 15 Oct 2013 10:42:44 +0000 (14:42 +0400)]
Merge pull request #1625 from ilya-lavrenov:to_string

11 years agoreplaced to_string by cv::format
Ilya Lavrenov [Tue, 15 Oct 2013 09:12:36 +0000 (13:12 +0400)]
replaced to_string by cv::format

11 years agoRecord OpenCV build type among the test properties.
Roman Donchenko [Mon, 14 Oct 2013 13:15:40 +0000 (17:15 +0400)]
Record OpenCV build type among the test properties.

Because apparently I love running performance tests for debug builds.

11 years agoMerge pull request #1622 from a0byte:2.4
Roman Donchenko [Tue, 15 Oct 2013 07:51:40 +0000 (11:51 +0400)]
Merge pull request #1622 from a0byte:2.4

11 years agoMerge pull request #1573 from alalek:perf_simple_strategy
Andrey Pavlenko [Mon, 14 Oct 2013 15:28:48 +0000 (19:28 +0400)]
Merge pull request #1573 from alalek:perf_simple_strategy

11 years agoMerge pull request #1617 from ilya-lavrenov:ocl_info
Andrey Pavlenko [Mon, 14 Oct 2013 15:27:00 +0000 (19:27 +0400)]
Merge pull request #1617 from ilya-lavrenov:ocl_info

11 years agoFixed typo in document.
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>
11 years agodemonstrative device info output
Ilya Lavrenov [Mon, 14 Oct 2013 07:58:45 +0000 (11:58 +0400)]
demonstrative device info output

11 years agoMerge pull request #1614 from ilya-lavrenov:ocl_svm_misprint
Andrey Pavlenko [Mon, 14 Oct 2013 12:43:18 +0000 (16:43 +0400)]
Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint

11 years agoMerge pull request #1612 from alalek:ocl_fix_string_info
Andrey Pavlenko [Mon, 14 Oct 2013 12:41:43 +0000 (16:41 +0400)]
Merge pull request #1612 from alalek:ocl_fix_string_info

11 years agoMerge pull request #1609 from ilya-lavrenov:ocl_some_optimization
Andrey Pavlenko [Mon, 14 Oct 2013 12:41:25 +0000 (16:41 +0400)]
Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization

11 years agoMerge pull request #1616 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Mon, 14 Oct 2013 11:16:01 +0000 (15:16 +0400)]
Merge pull request #1616 from ilya-lavrenov:ocl_cvtColor

11 years agomisprint in disabling ocl::svm
Ilya Lavrenov [Sun, 13 Oct 2013 19:54:09 +0000 (23:54 +0400)]
misprint in disabling ocl::svm

11 years agosome optimization of binary ocl::bitwise operations
Ilya Lavrenov [Fri, 11 Oct 2013 20:58:58 +0000 (00:58 +0400)]
some optimization of binary ocl::bitwise operations

11 years agoocl::cvtColor works with ROI properly
Ilya Lavrenov [Sun, 13 Oct 2013 19:09:14 +0000 (23:09 +0400)]
ocl::cvtColor works with ROI properly

11 years agoperf: added simple collection strategy
Alexander Alekhin [Sun, 6 Oct 2013 17:48:35 +0000 (21:48 +0400)]
perf: added simple collection strategy

11 years agoocl: fix for get string info from OpenCL
Alexander Alekhin [Sat, 12 Oct 2013 12:53:02 +0000 (16:53 +0400)]
ocl: fix for get string info from OpenCL

11 years agoMerge pull request #1610 from alalek:ocl_fix_perf_kalman
Andrey Pavlenko [Sat, 12 Oct 2013 12:31:02 +0000 (16:31 +0400)]
Merge pull request #1610 from alalek:ocl_fix_perf_kalman

11 years agoMerge pull request #1608 from alalek:fix_warn_upd_haar
Andrey Pavlenko [Sat, 12 Oct 2013 12:24:03 +0000 (16:24 +0400)]
Merge pull request #1608 from alalek:fix_warn_upd_haar

11 years agoMerge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup
Andrey Pavlenko [Sat, 12 Oct 2013 12:12:05 +0000 (16:12 +0400)]
Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup

11 years agoMerge pull request #1606 from ilya-lavrenov:ocl_imgproc
Andrey Pavlenko [Sat, 12 Oct 2013 12:10:03 +0000 (16:10 +0400)]
Merge pull request #1606 from ilya-lavrenov:ocl_imgproc

11 years agoMerge pull request #1602 from alalek:ocl_test_dump_info
Andrey Pavlenko [Sat, 12 Oct 2013 12:08:24 +0000 (16:08 +0400)]
Merge pull request #1602 from alalek:ocl_test_dump_info

11 years agoMerge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas
Andrey Pavlenko [Sat, 12 Oct 2013 12:04:05 +0000 (16:04 +0400)]
Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas

11 years agoocl: reverted type of perf test params for Kalman filter
Alexander Alekhin [Fri, 11 Oct 2013 22:36:53 +0000 (02:36 +0400)]
ocl: reverted type of perf test params for Kalman filter

11 years agorefactored ocl/src/imgproc.cpp
Ilya Lavrenov [Fri, 11 Oct 2013 15:22:25 +0000 (19:22 +0400)]
refactored ocl/src/imgproc.cpp

11 years agofft cleanup ignoring
Ilya Lavrenov [Fri, 11 Oct 2013 16:24:26 +0000 (20:24 +0400)]
fft cleanup ignoring

11 years agodisable SVM when AMD BLAS is not available
ilya-lavrenov [Fri, 11 Oct 2013 11:15:57 +0000 (15:15 +0400)]
disable SVM when AMD BLAS is not available

11 years agoMerge pull request #1605 from alalek:ocl_fixes
Andrey Pavlenko [Fri, 11 Oct 2013 14:55:53 +0000 (18:55 +0400)]
Merge pull request #1605 from alalek:ocl_fixes

11 years agoocl: fix warnings from GCC 4.8, update Haar
Alexander Alekhin [Fri, 11 Oct 2013 14:42:17 +0000 (18:42 +0400)]
ocl: fix warnings from GCC 4.8, update Haar

11 years agoocl: dump device info in tests
Alexander Alekhin [Fri, 11 Oct 2013 14:24:59 +0000 (18:24 +0400)]
ocl: dump device info in tests

11 years agoocl: fix CV_EXPORTS usage (misplaced in functions declarations)
Alexander Alekhin [Fri, 11 Oct 2013 12:55:22 +0000 (16:55 +0400)]
ocl: fix CV_EXPORTS usage (misplaced in functions declarations)

11 years agoocl: fix cleanup in static builds
Alexander Alekhin [Fri, 11 Oct 2013 12:39:26 +0000 (16:39 +0400)]
ocl: fix cleanup in static builds

11 years agoocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default)
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)

11 years agoMerge pull request #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
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

11 years agofixed ocl optical flow: sparse and tvl1
ilya-lavrenov [Fri, 11 Oct 2013 09:55:49 +0000 (13:55 +0400)]
fixed ocl optical flow: sparse and tvl1

11 years agoMerge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
Andrey Pavlenko [Fri, 11 Oct 2013 08:40:12 +0000 (12:40 +0400)]
Merge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings

11 years agoMerge pull request #1595 from alalek:cl_code_cleanup
Andrey Pavlenko [Fri, 11 Oct 2013 08:37:41 +0000 (12:37 +0400)]
Merge pull request #1595 from alalek:cl_code_cleanup

11 years agoocl: code cleanup, fix .clb files
Alexander Alekhin [Thu, 10 Oct 2013 21:16:12 +0000 (01:16 +0400)]
ocl: code cleanup, fix .clb files

11 years agoMerge pull request #1598 from alalek:ocl_fix_build_mac
Andrey Pavlenko [Thu, 10 Oct 2013 20:40:06 +0000 (00:40 +0400)]
Merge pull request #1598 from alalek:ocl_fix_build_mac

11 years agoMerge pull request #1594 from ilya-lavrenov:ocl_perf
Andrey Pavlenko [Thu, 10 Oct 2013 20:38:12 +0000 (00:38 +0400)]
Merge pull request #1594 from ilya-lavrenov:ocl_perf

11 years agoenabled accuracy tests for the functions that use inside AMD Blas/Fft
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

11 years agoocl: fix build on Mac
Alexander Alekhin [Thu, 10 Oct 2013 18:56:19 +0000 (22:56 +0400)]
ocl: fix build on Mac

11 years agofixed kernel compilation warnings on MacOSX
Ilya Lavrenov [Thu, 10 Oct 2013 18:28:09 +0000 (22:28 +0400)]
fixed kernel compilation warnings on MacOSX

11 years agoadded perf tests for min, max, abs
Ilya Lavrenov [Wed, 9 Oct 2013 15:37:09 +0000 (19:37 +0400)]
added perf tests for min, max, abs

11 years agoMerge pull request #1597 from alalek:ocl_fix_cleanup
Andrey Pavlenko [Thu, 10 Oct 2013 15:02:29 +0000 (19:02 +0400)]
Merge pull request #1597 from alalek:ocl_fix_cleanup

11 years agoMerge pull request #1596 from alalek:test_fix_run_py
Andrey Pavlenko [Thu, 10 Oct 2013 15:02:10 +0000 (19:02 +0400)]
Merge pull request #1596 from alalek:test_fix_run_py

11 years agoMerge pull request #1551 from alalek:cmake_install_win
Andrey Pavlenko [Thu, 10 Oct 2013 14:20:34 +0000 (18:20 +0400)]
Merge pull request #1551 from alalek:cmake_install_win

11 years agotest: run.py: return valid errorCode in case of the single test run
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

11 years agoocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft)
Alexander Alekhin [Sun, 6 Oct 2013 10:34:36 +0000 (14:34 +0400)]
ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft)

11 years agoMerge pull request #1592 from alalek:ocl_program_cache_update
Andrey Pavlenko [Thu, 10 Oct 2013 11:55:58 +0000 (15:55 +0400)]
Merge pull request #1592 from alalek:ocl_program_cache_update

11 years agoMerge pull request #1591 from alalek:ocl_remove_cl_hpp_h
Andrey Pavlenko [Thu, 10 Oct 2013 11:55:12 +0000 (15:55 +0400)]
Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h

11 years agoMerge pull request #1593 from ilya-lavrenov:ocl_war_on_double
Andrey Pavlenko [Thu, 10 Oct 2013 11:54:07 +0000 (15:54 +0400)]
Merge pull request #1593 from ilya-lavrenov:ocl_war_on_double

11 years agocatching OpenCL double not supported exceptions
Ilya Lavrenov [Wed, 9 Oct 2013 14:05:09 +0000 (18:05 +0400)]
catching OpenCL double not supported exceptions

11 years agoocl: fix compilation warnings, update openCLExecuteKernelInterop
Alexander Alekhin [Wed, 9 Oct 2013 12:57:52 +0000 (16:57 +0400)]
ocl: fix compilation warnings, update openCLExecuteKernelInterop

11 years agoocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms)
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)

11 years agocmake: export OpenCVModules for unix 'install', move macros desclarations
Alexander Alekhin [Wed, 9 Oct 2013 14:29:03 +0000 (18:29 +0400)]
cmake: export OpenCVModules for unix 'install', move macros desclarations

11 years agocmake: update java module install rules
Alexander Alekhin [Fri, 4 Oct 2013 13:48:43 +0000 (17:48 +0400)]
cmake: update java module install rules

11 years agocmake: python module updates
Alexander Alekhin [Fri, 4 Oct 2013 13:15:02 +0000 (17:15 +0400)]
cmake: python module updates

11 years agocmake: update install rules for doc
Alexander Alekhin [Fri, 4 Oct 2013 13:04:10 +0000 (17:04 +0400)]
cmake: update install rules for doc

11 years agocmake: OpenCVConfig.cmake: fix message
Alexander Alekhin [Thu, 3 Oct 2013 15:27:57 +0000 (19:27 +0400)]
cmake: OpenCVConfig.cmake: fix message

11 years agocmake: revert CRT linkage option for MSVS
Alexander Alekhin [Thu, 3 Oct 2013 14:48:07 +0000 (18:48 +0400)]
cmake: revert CRT linkage option for MSVS

11 years agocmake: workaround for dependencies resolver (bypass non-module deps w/o check)
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)

11 years agofixed warning on windows
ilya-lavrenov [Wed, 4 Sep 2013 14:32:05 +0000 (18:32 +0400)]
fixed warning on windows

11 years agoupdate cmake 'install' target for Windows platform
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).

11 years agoMerge pull request #1589 from ilya-lavrenov:pr1582_fix
Andrey Pavlenko [Wed, 9 Oct 2013 12:47:59 +0000 (16:47 +0400)]
Merge pull request #1589 from ilya-lavrenov:pr1582_fix

11 years agochanges eps for NORM_L1
Ilya Lavrenov [Wed, 9 Oct 2013 10:18:07 +0000 (14:18 +0400)]
changes eps for NORM_L1

11 years agofixed the PR 1582
Ilya Lavrenov [Wed, 9 Oct 2013 10:07:24 +0000 (14:07 +0400)]
fixed the PR 1582

11 years agoMerge pull request #1579 from ilya-lavrenov:ocl_norm
Andrey Pavlenko [Wed, 9 Oct 2013 09:52:20 +0000 (13:52 +0400)]
Merge pull request #1579 from ilya-lavrenov:ocl_norm

11 years agoMerge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix
Andrey Pavlenko [Wed, 9 Oct 2013 09:49:34 +0000 (13:49 +0400)]
Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix

11 years agoMerge pull request #1582 from sperrholz:ocl-arithm-additions
Roman Donchenko [Wed, 9 Oct 2013 08:36:01 +0000 (12:36 +0400)]
Merge pull request #1582 from sperrholz:ocl-arithm-additions

11 years agoocl setto fix for windows
Ilya Lavrenov [Tue, 8 Oct 2013 14:25:40 +0000 (18:25 +0400)]
ocl setto fix for windows

11 years agoocl setto fix for windows
Ilya Lavrenov [Tue, 8 Oct 2013 14:25:40 +0000 (18:25 +0400)]
ocl setto fix for windows

11 years agofix documentation warning
Sebastian Krämer [Tue, 8 Oct 2013 14:49:20 +0000 (16:49 +0200)]
fix documentation warning

11 years agofixed ocl::norm (previously the function used double as a work type)
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)

11 years agoadd ocl::abs
Sebastian Krämer [Tue, 8 Oct 2013 13:16:30 +0000 (15:16 +0200)]
add ocl::abs

11 years agodocumentation update for ocl::min and ocl::max
Sebastian Krämer [Mon, 7 Oct 2013 13:51:01 +0000 (15:51 +0200)]
documentation update for ocl::min and ocl::max

11 years agoadd ocl::min and ocl::max (includes accuracy tests update)
Sebastian Krämer [Mon, 7 Oct 2013 13:41:50 +0000 (15:41 +0200)]
add ocl::min and ocl::max (includes accuracy tests update)

11 years agoMerge pull request #1574 from alalek:svm_workaround
Roman Donchenko [Tue, 8 Oct 2013 11:31:42 +0000 (15:31 +0400)]
Merge pull request #1574 from alalek:svm_workaround

11 years agoMerge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12
Roman Donchenko [Tue, 8 Oct 2013 11:14:38 +0000 (15:14 +0400)]
Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12

11 years agoMerge pull request #1576 from alalek:ocl_fix_cl_double
Roman Donchenko [Tue, 8 Oct 2013 10:20:11 +0000 (14:20 +0400)]
Merge pull request #1576 from alalek:ocl_fix_cl_double

11 years agoMerge pull request #1538 from StevenPuttemans:bugfix_3283
Roman Donchenko [Tue, 8 Oct 2013 09:00:38 +0000 (13:00 +0400)]
Merge pull request #1538 from StevenPuttemans:bugfix_3283

11 years agoMerge pull request #1545 from alalek:ocl_test_fix_rng
Roman Donchenko [Tue, 8 Oct 2013 08:59:49 +0000 (12:59 +0400)]
Merge pull request #1545 from alalek:ocl_test_fix_rng

11 years agoenabled OpenCL 1.2 branch in oclMat::setTo
Ilya Lavrenov [Mon, 7 Oct 2013 18:10:11 +0000 (22:10 +0400)]
enabled OpenCL 1.2 branch in oclMat::setTo

11 years agoMerge pull request #1570 from ilya-lavrenov:ipp_warn_fix
Roman Donchenko [Tue, 8 Oct 2013 08:32:57 +0000 (12:32 +0400)]
Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix

11 years agoocl: fix Context::CL_* usage
Alexander Alekhin [Mon, 7 Oct 2013 17:01:33 +0000 (21:01 +0400)]
ocl: fix Context::CL_* usage

11 years agoMerge pull request #1578 from asmorkalov:android_fd_cp_fix
Roman Donchenko [Tue, 8 Oct 2013 08:22:14 +0000 (12:22 +0400)]
Merge pull request #1578 from asmorkalov:android_fd_cp_fix

11 years agoInvalid copy-passed exception messages in FaceDetect sample for Android fixed.
Alexander Smorkalov [Tue, 8 Oct 2013 06:28:24 +0000 (10:28 +0400)]
Invalid copy-passed exception messages in FaceDetect sample for Android fixed.

11 years agosvm: disable failed tests
Alexander Alekhin [Mon, 7 Oct 2013 12:08:05 +0000 (16:08 +0400)]
svm: disable failed tests

11 years agoMerge pull request #1566 from SpecLad:Wshadow-openni
Roman Donchenko [Mon, 7 Oct 2013 11:48:39 +0000 (15:48 +0400)]
Merge pull request #1566 from SpecLad:Wshadow-openni

11 years agofixed ipp-related warnings
Ilya Lavrenov [Sat, 5 Oct 2013 10:35:31 +0000 (14:35 +0400)]
fixed ipp-related warnings

11 years agoMerge pull request #1564 from alalek:cl_runtime_fix_32bit
Roman Donchenko [Fri, 4 Oct 2013 14:29:03 +0000 (18:29 +0400)]
Merge pull request #1564 from alalek:cl_runtime_fix_32bit

11 years agoMerge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update
Roman Donchenko [Fri, 4 Oct 2013 14:25:44 +0000 (18:25 +0400)]
Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update

11 years agoMerge pull request #1560 from jet47:cmake-config-cuda-5.5-fix
Roman Donchenko [Fri, 4 Oct 2013 14:15:05 +0000 (18:15 +0400)]
Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix