GregoryMorse [Sun, 22 Dec 2013 16:28:50 +0000 (00:28 +0800)]
Update CMakeLists.txt
WinRT native C++ support allowing building of static libraries
Update CMakeLists.txt
Update OpenCVCRTLinkage.cmake
Update OpenCVCRTLinkage.cmake
Andrey Pavlenko [Sat, 21 Dec 2013 08:44:05 +0000 (12:44 +0400)]
Merge pull request #2023 from krodyush:pullreq/2.4-opt-131126-cvt
Roman Donchenko [Fri, 20 Dec 2013 13:06:27 +0000 (17:06 +0400)]
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
Roman Donchenko [Fri, 20 Dec 2013 13:04:17 +0000 (17:04 +0400)]
Merge pull request #1966 from asmorkalov:ocv_neon_support
Andrey Pavlenko [Fri, 20 Dec 2013 12:50:00 +0000 (16:50 +0400)]
Merge pull request #2014 from krodyush:pullreq/2.4-opt-131211-surf
Alexander Smorkalov [Tue, 10 Dec 2013 07:22:29 +0000 (11:22 +0400)]
NEON instruction set control unified for regular and cross-compiler builds.
krodyush [Fri, 20 Dec 2013 09:51:51 +0000 (13:51 +0400)]
change code according reviewer suggesions
Vladimir Bystricky [Fri, 20 Dec 2013 08:33:39 +0000 (12:33 +0400)]
Remove TBB ifdef form code
Roman Donchenko [Fri, 20 Dec 2013 07:57:29 +0000 (11:57 +0400)]
Merge pull request #1994 from StevenPuttemans:bugfix_3431
krodyush [Thu, 19 Dec 2013 18:56:46 +0000 (22:56 +0400)]
Improve ocl cvt_color performance for the following conversions: RGB<->BGR, RGB->Gray, RGB<->XYZ, RGB<->YCrCb, RGB<->YUV, and mRGBA<->RGBA.
The improvement was done basically by processing more than 1 pixel by each work-item and using vector's operations.
new performance tests were added
Andrey Pavlenko [Thu, 19 Dec 2013 13:08:52 +0000 (17:08 +0400)]
Merge pull request #1765 from ilya-lavrenov:cv_remap
Andrey Pavlenko [Thu, 19 Dec 2013 12:46:58 +0000 (16:46 +0400)]
Merge pull request #2007 from krodyush:pullreq/2.4-opt-131202-haar
Andrey Pavlenko [Thu, 19 Dec 2013 12:46:40 +0000 (16:46 +0400)]
Merge pull request #2005 from krodyush:pullreq/2.4-opt-131114-extractCovData
Andrey Pavlenko [Thu, 19 Dec 2013 12:14:42 +0000 (16:14 +0400)]
Merge pull request #2008 from krodyush:pullreq/2.4-opt-131209-hog
Andrey Pavlenko [Thu, 19 Dec 2013 09:48:39 +0000 (13:48 +0400)]
Merge pull request #2006 from krodyush:pullreq/2.4-opt-131120-gfft
Andrey Pavlenko [Thu, 19 Dec 2013 09:38:52 +0000 (13:38 +0400)]
Merge pull request #2009 from krodyush:pullreq/2.4-opt-131211-sepFilterSinglePass_final
Vladimir Bystricky [Thu, 19 Dec 2013 06:29:19 +0000 (10:29 +0400)]
Fix comment in the cmake file from SSDK to SDK
Andrey Pavlenko [Wed, 18 Dec 2013 15:13:22 +0000 (19:13 +0400)]
Merge pull request #2015 from apavlenko:2.4_fix_ts_rng-fill
Roman Donchenko [Wed, 18 Dec 2013 13:36:18 +0000 (17:36 +0400)]
Merge pull request #2011 from ilya-lavrenov:dft_dct
Andrey Pavlenko [Wed, 18 Dec 2013 13:27:39 +0000 (17:27 +0400)]
adding more than 4 channels random Mats support
if `Scalar:all` is used, Mats with 5+ channels cause errors
Andrey Pavlenko [Wed, 18 Dec 2013 13:05:17 +0000 (17:05 +0400)]
Merge pull request #2013 from apavlenko:2.4_fd_sample
Andrey Pavlenko [Wed, 18 Dec 2013 13:02:39 +0000 (17:02 +0400)]
adding timing for multi-threaded case
krodyush [Wed, 18 Dec 2013 10:27:51 +0000 (14:27 +0400)]
intel device guard was added because of perf degradation on some non intel platform.
Vladimir Bystricky [Wed, 18 Dec 2013 07:46:52 +0000 (11:46 +0400)]
Delete end comma in enumerations
Vladimir Bystricky [Wed, 18 Dec 2013 06:55:09 +0000 (10:55 +0400)]
Add CV_CAP_INTELPERC and CV_CAP_PROP_INTELPERC_ prefixes to const_ignore_list
Vladimir Bystricky [Wed, 18 Dec 2013 05:59:24 +0000 (09:59 +0400)]
Fix errors in example (samples/cpp/intelperc_capture.cpp)
Andrey Pavlenko [Tue, 17 Dec 2013 20:15:02 +0000 (00:15 +0400)]
minor refactoring, no functional changes
Vladimir Bystricky [Tue, 17 Dec 2013 14:39:52 +0000 (18:39 +0400)]
Fix build errors
krodyush [Tue, 17 Dec 2013 13:46:09 +0000 (17:46 +0400)]
update doc to be consisted with headers
Ilya Lavrenov [Tue, 17 Dec 2013 13:41:28 +0000 (17:41 +0400)]
typo
krodyush [Tue, 17 Dec 2013 13:12:57 +0000 (17:12 +0400)]
GFFT fix for linux build
Vladimir Bystricky [Tue, 17 Dec 2013 12:13:55 +0000 (16:13 +0400)]
Fix notes about cmake files. Fix build warning.
krodyush [Tue, 17 Dec 2013 10:12:33 +0000 (14:12 +0400)]
optimize SURF by
Inlining and customizing sampling functions to reduce memory traffic and compute
Improve calcOrientation implementation.
Using more efficient rounding routines.
Removing unnecessary use of local memory
krodyush [Tue, 17 Dec 2013 10:09:06 +0000 (14:09 +0400)]
optimize separable filter by
Added "sep_filter_singlepass" kernel that performs separable filtering in one kernel call
Added appropriate host part - sepFilter2D_SinglePass function and SingleStepSeparableFilterEngine_GPU class
Changed function declarations to enable their usage
krodyush [Tue, 17 Dec 2013 10:06:14 +0000 (14:06 +0400)]
Changes the datatype of the angle of the gradient for Intel platforms.
krodyush [Tue, 17 Dec 2013 10:04:10 +0000 (14:04 +0400)]
remove extra calculations from haar to be consistent with native implementation
krodyush [Tue, 17 Dec 2013 10:02:57 +0000 (14:02 +0400)]
HOST side optimization for GFFT
krodyush [Tue, 17 Dec 2013 10:01:01 +0000 (14:01 +0400)]
optimize Dx and Dy calcualtion to make it as single opencl kernel
Roman Donchenko [Tue, 17 Dec 2013 09:17:25 +0000 (13:17 +0400)]
Merge pull request #1987 from pentschev:cv_completesymm_template_2.4
Vladimir Bystricky [Tue, 17 Dec 2013 08:00:40 +0000 (12:00 +0400)]
Add set/get depth generator properties by default. Add documentation
StevenPuttemans [Mon, 16 Dec 2013 10:05:53 +0000 (11:05 +0100)]
Fixed suggestion of bugfix 3431
Seems correct to me and builds fine
Roman Donchenko [Mon, 16 Dec 2013 08:11:43 +0000 (12:11 +0400)]
Merge pull request #1990 from AD-530:Issue3164
Peter Andreas Entschev [Sun, 15 Dec 2013 00:48:01 +0000 (22:48 -0200)]
cv::completeSymm fixed to work with any OpenCV data type and multiple channels.
Matthias Bady [Sun, 15 Dec 2013 21:41:07 +0000 (22:41 +0100)]
fixed init of clCxt
Vladimir Bystricky [Fri, 13 Dec 2013 13:25:16 +0000 (17:25 +0400)]
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
Andrey Pavlenko [Fri, 13 Dec 2013 12:09:08 +0000 (16:09 +0400)]
Merge pull request #1980 from alalek:ocl_interop_initialization
Alexander Alekhin [Thu, 12 Dec 2013 15:59:22 +0000 (19:59 +0400)]
ocl: add support for initialization from user-provided OpenCL handles
Andrey Pavlenko [Thu, 12 Dec 2013 05:55:33 +0000 (09:55 +0400)]
Merge pull request #1976 from alalek:ocl_multiple_command_queues
Andrey Pavlenko [Wed, 11 Dec 2013 17:25:31 +0000 (21:25 +0400)]
Merge pull request #1975 from magomimmo:clj-tut
Alexander Alekhin [Wed, 11 Dec 2013 14:49:50 +0000 (18:49 +0400)]
ocl: implemented per-thread OpenCL command queue
Alexander Alekhin [Wed, 11 Dec 2013 14:49:13 +0000 (18:49 +0400)]
core: added TLS support
Roman Donchenko [Wed, 11 Dec 2013 12:55:26 +0000 (16:55 +0400)]
Merge pull request #1968 from pentschev:fix_indentation_freak_2.4
Mimmmo Cosenza [Wed, 11 Dec 2013 12:35:20 +0000 (13:35 +0100)]
remove Daniele
Mimmmo Cosenza [Wed, 11 Dec 2013 12:30:52 +0000 (13:30 +0100)]
add tutorial content
Mimmmo Cosenza [Wed, 11 Dec 2013 12:28:27 +0000 (13:28 +0100)]
add clojure tutorial
Mimmmo Cosenza [Wed, 11 Dec 2013 12:28:04 +0000 (13:28 +0100)]
add clojure logo
Mimmmo Cosenza [Wed, 11 Dec 2013 12:26:47 +0000 (13:26 +0100)]
add clojure sample
Mimmmo Cosenza [Wed, 11 Dec 2013 12:25:53 +0000 (13:25 +0100)]
add Mimmo Cosenza to Authors
Peter Andreas Entschev [Tue, 10 Dec 2013 10:57:46 +0000 (08:57 -0200)]
Fixing some indentation issues on FREAK source file.
Roman Donchenko [Mon, 9 Dec 2013 13:25:33 +0000 (17:25 +0400)]
Merge pull request #1959 from botverse:2.4
Alfonso (the fonz) de la Osa [Mon, 9 Dec 2013 10:55:44 +0000 (10:55 +0000)]
--no-display property fix in stereo_match.cpp sample
Roman Donchenko [Mon, 9 Dec 2013 09:14:15 +0000 (13:14 +0400)]
Merge pull request #1946 from asmorkalov:android_manager_version_inc3
Alexander Smorkalov [Fri, 6 Dec 2013 14:01:15 +0000 (18:01 +0400)]
OpenCV Manager version++.
Roman Donchenko [Fri, 6 Dec 2013 13:56:59 +0000 (17:56 +0400)]
Merge pull request #1945 from apavlenko:2.4_version_update
Andrey Pavlenko [Fri, 6 Dec 2013 12:59:02 +0000 (16:59 +0400)]
Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4
Andrey Pavlenko [Fri, 6 Dec 2013 12:21:22 +0000 (16:21 +0400)]
updating version to 2.4.7.2
Andrey Pavlenko [Fri, 6 Dec 2013 12:06:03 +0000 (16:06 +0400)]
Merge pull request #1927 from JBosch:issue3409
Andrey Pavlenko [Fri, 6 Dec 2013 12:00:10 +0000 (16:00 +0400)]
Merge pull request #1872 from KonstantinMatskevich:ocl_mt_test
Andrey Pavlenko [Fri, 6 Dec 2013 11:56:14 +0000 (15:56 +0400)]
Merge pull request #1762 from jet47:cuda-6.0-npp-fix
Andrey Pavlenko [Fri, 6 Dec 2013 11:51:59 +0000 (15:51 +0400)]
Merge pull request #1844 from StevenPuttemans:bugfix_3370
Andrey Pavlenko [Fri, 6 Dec 2013 11:47:39 +0000 (15:47 +0400)]
Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers
Peter Andreas Entschev [Fri, 6 Dec 2013 11:31:18 +0000 (09:31 -0200)]
Removing ocl::oclMat::ptr() method.
The method ocl::oclMat::ptr() is being removed because it returns a pointer to a row of oclMat::data. The data attribute is a cl_mem structure and cannot be iterated outside an OpenCL kernel.
Andrey Pavlenko [Fri, 6 Dec 2013 11:05:34 +0000 (15:05 +0400)]
Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4
Konstantin Matskevich [Fri, 6 Dec 2013 11:03:27 +0000 (03:03 -0800)]
Merge pull request #2 from apavlenko/ocl_mt_test
minor improvements
Andrey Pavlenko [Fri, 6 Dec 2013 10:56:47 +0000 (14:56 +0400)]
Merge pull request #1929 from alalek:ocl_haar_amd_beta
Andrey Pavlenko [Fri, 6 Dec 2013 10:49:36 +0000 (14:49 +0400)]
minor improvements
Konstantin Matskevich [Fri, 6 Dec 2013 08:12:24 +0000 (12:12 +0400)]
some fixes
Peter Andreas Entschev [Thu, 5 Dec 2013 21:27:10 +0000 (19:27 -0200)]
ocl::BruteForceMatcher fix wrong use of oclMat::ptr().
The oclMat::ptr() method was mistakenly used in ocl::BruteForceMatcher to pass a pointer to a oclMat object. The ptr() method returns a uchar pointer to the cl_mem data structure and this method will be removed.
Andrey Pavlenko [Thu, 5 Dec 2013 13:05:25 +0000 (17:05 +0400)]
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4
Alexander Alekhin [Thu, 5 Dec 2013 09:52:26 +0000 (13:52 +0400)]
ocl: added workaround into Haar kernels
Andrey Pavlenko [Thu, 5 Dec 2013 12:46:25 +0000 (16:46 +0400)]
Merge pull request #1920 from alalek:ocl_disable_workaround
Konstantin Matskevich [Mon, 2 Dec 2013 07:15:46 +0000 (11:15 +0400)]
multithreading facedetector
Konstantin Matskevich [Fri, 22 Nov 2013 10:47:58 +0000 (14:47 +0400)]
facedetect
Zhigang Gong [Tue, 3 Dec 2013 02:49:51 +0000 (10:49 +0800)]
Fixed some implicitly type conversions between vector and scalar data type.
There are some mixed implicitly/explicitly type conversion between
scalar and vector. Although the spec allows those conversion, I prefer
to make them consistent and use explicitly all the cases.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
Josep Bosch [Wed, 4 Dec 2013 21:32:20 +0000 (22:32 +0100)]
Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.
Ilya Lavrenov [Thu, 7 Nov 2013 21:08:36 +0000 (01:08 +0400)]
fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1
Andrey Pavlenko [Wed, 4 Dec 2013 15:56:31 +0000 (19:56 +0400)]
Merge pull request #1924 from ilya-lavrenov:svm
Baichuan Su [Tue, 12 Nov 2013 05:13:25 +0000 (13:13 +0800)]
Modify default setting, using ocl method when have ocl module
Baichuan Su [Mon, 11 Nov 2013 03:46:07 +0000 (11:46 +0800)]
Add Macro to decide using ocl method or not.
Baichuan Su [Sat, 9 Nov 2013 00:42:39 +0000 (08:42 +0800)]
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.
Roman Donchenko [Wed, 4 Dec 2013 11:46:56 +0000 (15:46 +0400)]
Merge pull request #1921 from SpecLad:defined-msc-ver
Roman Donchenko [Wed, 4 Dec 2013 09:55:45 +0000 (13:55 +0400)]
Merge pull request #1919 from SpecLad:platfrom
Roman Donchenko [Wed, 4 Dec 2013 09:55:28 +0000 (13:55 +0400)]
Merge pull request #1915 from jet47:gpu-color-test-fix
Alexander Alekhin [Wed, 4 Dec 2013 09:00:37 +0000 (13:00 +0400)]
ocl: try to disable clFinish workaround
Roman Donchenko [Wed, 4 Dec 2013 08:39:20 +0000 (12:39 +0400)]
Fixed a -Wundef warning in cl_platform.h.
_MSC_VER -> defined _MSC_VER. Fixes building with MinGW.
Similar to
fbc91c5ee.
Andrey Pavlenko [Tue, 3 Dec 2013 15:20:04 +0000 (19:20 +0400)]
Merge pull request #1911 from apavlenko:2.4_fix_vc12
Roman Donchenko [Tue, 3 Dec 2013 13:58:04 +0000 (17:58 +0400)]
Merge pull request #1916 from alalek:ocl_moments_fix_perf
Andrey Pavlenko [Tue, 3 Dec 2013 13:46:09 +0000 (17:46 +0400)]
fixing compilation on Linux
Roman Donchenko [Tue, 3 Dec 2013 13:33:28 +0000 (17:33 +0400)]
Fixed the "platfrom" typo everywhere.
Andrey Pavlenko [Tue, 3 Dec 2013 12:08:57 +0000 (16:08 +0400)]
Added patch from master for fixing VS2013 in 3rd party lib OpenEXR