platform/upstream/opencv.git
8 years agocode style
filipsladek [Tue, 29 Mar 2016 20:44:03 +0000 (22:44 +0200)]
code style

8 years agoBox filter implemented for CV_32FC1
filipsladek [Tue, 29 Mar 2016 20:30:49 +0000 (22:30 +0200)]
Box filter implemented for CV_32FC1

8 years agoMerge pull request #6321 from mshabunin:hal_cmake
Vadim Pisarevsky [Sun, 27 Mar 2016 08:06:24 +0000 (08:06 +0000)]
Merge pull request #6321 from mshabunin:hal_cmake

8 years agoMerge pull request #6326 from sovrasov:python_samples_update
Vadim Pisarevsky [Sun, 27 Mar 2016 08:03:28 +0000 (08:03 +0000)]
Merge pull request #6326 from sovrasov:python_samples_update

8 years agoMerge pull request #6311 from peters:master
Alexander Alekhin [Sat, 26 Mar 2016 19:55:17 +0000 (19:55 +0000)]
Merge pull request #6311 from peters:master

8 years agoMerge pull request #6313 from amannababanana:master
Alexander Alekhin [Fri, 25 Mar 2016 11:31:17 +0000 (11:31 +0000)]
Merge pull request #6313 from amannababanana:master

8 years agoMerge pull request #6322 from berak:fix_linux_eclipse_tutorial
Maksim Shabunin [Fri, 25 Mar 2016 07:39:19 +0000 (07:39 +0000)]
Merge pull request #6322 from berak:fix_linux_eclipse_tutorial

8 years agoReplace of some synthetic scenes in python samples
Vladislav Sovrasov [Thu, 24 Mar 2016 17:05:26 +0000 (20:05 +0300)]
Replace of some synthetic scenes in python samples

8 years agofix changed libraries in eclipse tutorial
berak [Thu, 24 Mar 2016 14:56:10 +0000 (15:56 +0100)]
fix changed libraries in eclipse tutorial

8 years agoFixed cutom_hal.hpp file generation
Maksim Shabunin [Thu, 24 Mar 2016 14:39:16 +0000 (17:39 +0300)]
Fixed cutom_hal.hpp file generation

8 years agoUsing find_package to import custom HAL library
Maksim Shabunin [Thu, 24 Mar 2016 14:05:54 +0000 (17:05 +0300)]
Using find_package to import custom HAL library

8 years agoMerge pull request #6243 from mshabunin:hal_morph
Vadim Pisarevsky [Wed, 23 Mar 2016 13:09:19 +0000 (13:09 +0000)]
Merge pull request #6243 from mshabunin:hal_morph

8 years agoMerge pull request #6285 from sovrasov:python_tests_cleanup
Vadim Pisarevsky [Wed, 23 Mar 2016 13:07:00 +0000 (13:07 +0000)]
Merge pull request #6285 from sovrasov:python_tests_cleanup

8 years agoremove trailing whitespace
Lucas Solomon [Wed, 23 Mar 2016 05:31:16 +0000 (22:31 -0700)]
remove trailing whitespace

8 years agoreturn 0 from VideoCapture::read() when cannot connect to camera
Lucas Solomon [Wed, 23 Mar 2016 02:03:28 +0000 (19:03 -0700)]
return 0 from VideoCapture::read() when cannot connect to camera

8 years agoAdd support for ffmpeg 3.0.
Peter Rekdal Sunde [Tue, 22 Mar 2016 12:26:55 +0000 (13:26 +0100)]
Add support for ffmpeg 3.0.

8 years agoMerge pull request #6286 from StevenPuttemans:add_num_features_info
Maksim Shabunin [Mon, 21 Mar 2016 14:08:49 +0000 (14:08 +0000)]
Merge pull request #6286 from StevenPuttemans:add_num_features_info

8 years agoMerge pull request #6300 from berak:fix_akaze_sample
Maksim Shabunin [Mon, 21 Mar 2016 14:01:17 +0000 (14:01 +0000)]
Merge pull request #6300 from berak:fix_akaze_sample

8 years agoMerge pull request #6214 from vonnieda:java_features2d
Maksim Shabunin [Mon, 21 Mar 2016 11:51:11 +0000 (11:51 +0000)]
Merge pull request #6214 from vonnieda:java_features2d

8 years agoMerge pull request #6267 from dtmoodie:issue_5918
Alexander Alekhin [Mon, 21 Mar 2016 09:37:11 +0000 (09:37 +0000)]
Merge pull request #6267 from dtmoodie:issue_5918

8 years agoMerge pull request #6150 from lvv:fix-6149-applColorMap
Maksim Shabunin [Mon, 21 Mar 2016 09:20:51 +0000 (09:20 +0000)]
Merge pull request #6150 from lvv:fix-6149-applColorMap

8 years agoHAL interface for morphology operations
Maksim Shabunin [Fri, 19 Feb 2016 10:49:13 +0000 (13:49 +0300)]
HAL interface for morphology operations

8 years agofix: 6149 (through CV_Error on wrong image type)
Leonid Volnitsky [Thu, 25 Feb 2016 10:23:49 +0000 (12:23 +0200)]
fix: 6149 (through CV_Error on wrong image type)

8 years agoremove opencv_contrib dependancy from planar_tracking.cpp
berak [Sat, 19 Mar 2016 08:55:18 +0000 (09:55 +0100)]
remove opencv_contrib dependancy from planar_tracking.cpp

8 years agoMerge pull request #6290 from dtmoodie:thrust_allocator_usage_pr
Alexander Alekhin [Fri, 18 Mar 2016 12:14:20 +0000 (12:14 +0000)]
Merge pull request #6290 from dtmoodie:thrust_allocator_usage_pr

8 years agoAdd goodfeatures python test and cleanup in test directory
Vladislav Sovrasov [Thu, 17 Mar 2016 12:33:28 +0000 (15:33 +0300)]
Add goodfeatures python test and cleanup in test directory

8 years agoFixed regression in cv::VideoCapture with gstreamer back end that prevented viewing...
Dan [Thu, 18 Feb 2016 05:39:44 +0000 (00:39 -0500)]
Fixed regression in cv::VideoCapture with gstreamer back end that prevented viewing of rtsp streams.

8 years agoadd cascade classifier info - total number of unique features passed to boosting...
StevenPuttemans [Thu, 17 Mar 2016 12:34:01 +0000 (13:34 +0100)]
add cascade classifier info - total number of unique features passed to boosting process

8 years agoMerge pull request #6283 from jlubawy:vfw-surface4-fix
Alexander Alekhin [Thu, 17 Mar 2016 11:08:12 +0000 (11:08 +0000)]
Merge pull request #6283 from jlubawy:vfw-surface4-fix

8 years agoRemove cstdio debug
Josh Lubawy [Thu, 17 Mar 2016 08:00:49 +0000 (01:00 -0700)]
Remove cstdio debug

8 years agoAdd support for YUV 4:2:0 NV12 frame format in VFW camera capture
Josh Lubawy [Thu, 17 Mar 2016 06:38:17 +0000 (23:38 -0700)]
Add support for YUV 4:2:0 NV12 frame format in VFW camera capture

8 years agoMerge pull request #6273 from Bleach665:vs2010_mser_sampl
Alexander Alekhin [Wed, 16 Mar 2016 21:32:41 +0000 (21:32 +0000)]
Merge pull request #6273 from Bleach665:vs2010_mser_sampl

8 years agofix build detect_mser sample in vc2010
Bleach666 [Wed, 16 Mar 2016 14:51:20 +0000 (16:51 +0200)]
fix build detect_mser sample in vc2010

8 years agoMerge pull request #6270 from robbertkl:patch-2
Alexander Alekhin [Wed, 16 Mar 2016 13:50:03 +0000 (13:50 +0000)]
Merge pull request #6270 from robbertkl:patch-2

8 years agoMerge pull request #6274 from Bleach665:cmake_policy_0020
Alexander Alekhin [Wed, 16 Mar 2016 13:49:32 +0000 (13:49 +0000)]
Merge pull request #6274 from Bleach665:cmake_policy_0020

8 years agosuppress warning while generating solution in cmake
Bleach666 [Wed, 16 Mar 2016 11:12:44 +0000 (13:12 +0200)]
suppress warning while generating solution in cmake

8 years agoReplace deprecated malloc.h
Robbert Klarenbeek [Tue, 15 Mar 2016 17:02:41 +0000 (18:02 +0100)]
Replace deprecated malloc.h

8 years agoMerge pull request #6268 from robbertkl:patch-1
Alexander Alekhin [Wed, 16 Mar 2016 09:59:36 +0000 (09:59 +0000)]
Merge pull request #6268 from robbertkl:patch-1

8 years agoFix incompatibility with some C++11 implementations
Robbert Klarenbeek [Tue, 15 Mar 2016 16:21:05 +0000 (17:21 +0100)]
Fix incompatibility with some C++11 implementations

8 years agoMerge branch 'issue_6251' of http://github.com/dtmoodie/opencv into thrust_allocator_...
Dan [Tue, 15 Mar 2016 15:18:41 +0000 (11:18 -0400)]
Merge branch 'issue_6251' of github.com/dtmoodie/opencv into thrust_allocator_usage_pr

8 years agoThrust allocator usage.
Dan [Thu, 10 Mar 2016 18:39:21 +0000 (13:39 -0500)]
Thrust allocator usage.

8 years agoCompatibility and bug fixes.
Dan [Thu, 10 Dec 2015 16:21:16 +0000 (11:21 -0500)]
Compatibility and bug fixes.

8 years agoFixed more missing async calls.
Dan [Wed, 9 Dec 2015 16:08:17 +0000 (11:08 -0500)]
Fixed more missing async calls.

8 years agoImplemented async calls.
Dan [Wed, 9 Dec 2015 16:05:07 +0000 (11:05 -0500)]
Implemented async calls.

8 years agoMerge pull request #6266 from gongzg:master
Alexander Alekhin [Tue, 15 Mar 2016 12:51:20 +0000 (12:51 +0000)]
Merge pull request #6266 from gongzg:master

8 years agofix potential race condition in canny.cl.
Zhigang Gong [Tue, 15 Mar 2016 11:11:15 +0000 (19:11 +0800)]
fix potential race condition in canny.cl.

See the below code snippet:

while(l_counter != 0)
{
    int mod = l_counter % LOCAL_TOTAL;
    int pix_per_thr = l_counter / LOCAL_TOTAL + ((lid < mod) ? 1 : 0);

    for (int i = 0; i < pix_per_thr; ++i)
    {
        int index = atomic_dec(&l_counter) - 1;
        ....
    }
    ....
    barrier(CLK_LOCAL_MEM_FENCE);
}

If we don't put a barrier before the for loop, then there is a possiblity
that some work item enter this loop but the others are not, the the l_counter
will be reduced in the for loop and may be changed to zero, and the other
work items may can't enter the while loop. If this happens, it breaks the
barrier's rule which requires all the work items reach the same barrier.
And it may hang the GPU depends on the implementation of opencl platform.

This issue is raised at:
https://github.com/Itseez/opencv/issues/5175

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
8 years agoMerge pull request #6261 from dtmoodie:issue_6251
Alexander Alekhin [Tue, 15 Mar 2016 07:51:24 +0000 (07:51 +0000)]
Merge pull request #6261 from dtmoodie:issue_6251

8 years agoLinux bug fix for ThrustAllocator.
Dan [Mon, 14 Mar 2016 15:09:52 +0000 (11:09 -0400)]
Linux bug fix for ThrustAllocator.

8 years agoMerge pull request #6259 from polevoy-d-v:move_sematics_fix
Alexander Alekhin [Mon, 14 Mar 2016 14:46:21 +0000 (14:46 +0000)]
Merge pull request #6259 from polevoy-d-v:move_sematics_fix

8 years agoMerge pull request #6255 from delftswa2016:fix-5002
Alexander Alekhin [Mon, 14 Mar 2016 14:46:06 +0000 (14:46 +0000)]
Merge pull request #6255 from delftswa2016:fix-5002

8 years agofixed incorrect behaviour of move semantics for cv::Ptr, cv::Mat, cv::UMat in case...
Прун Виктор [Mon, 14 Mar 2016 13:10:23 +0000 (16:10 +0300)]
fixed incorrect behaviour of move semantics for cv::Ptr, cv::Mat, cv::UMat in case when rvalue-reference references to *this.

8 years agoMerge pull request #6254 from berak:patch-2
Alexander Alekhin [Mon, 14 Mar 2016 11:27:55 +0000 (11:27 +0000)]
Merge pull request #6254 from berak:patch-2

8 years agoMerge pull request #6253 from berak:patch-1
Alexander Alekhin [Mon, 14 Mar 2016 11:27:11 +0000 (11:27 +0000)]
Merge pull request #6253 from berak:patch-1

8 years agoMerge pull request #6249 from sturkmen72:patch-15
Alexander Alekhin [Mon, 14 Mar 2016 11:26:51 +0000 (11:26 +0000)]
Merge pull request #6249 from sturkmen72:patch-15

8 years agoMerge pull request #6045 from matthieu-ft:master
Alexander Alekhin [Mon, 14 Mar 2016 11:25:22 +0000 (11:25 +0000)]
Merge pull request #6045 from matthieu-ft:master

8 years agoRemoved older libraries pointing to 2.4 in eclipse tutorial docs
renu285 [Mon, 14 Mar 2016 11:09:56 +0000 (12:09 +0100)]
Removed older libraries pointing to 2.4 in eclipse tutorial docs

8 years agotrain_svmsgd.cpp : float response
berak [Mon, 14 Mar 2016 07:09:36 +0000 (08:09 +0100)]
train_svmsgd.cpp : float response

responses must be float, else we trigger an assertion in line 150

8 years agosvmsgd.cpp, fix #6248
berak [Mon, 14 Mar 2016 07:02:09 +0000 (08:02 +0100)]
svmsgd.cpp, fix #6248

add a cast to double, to make vs compilers happy

8 years agoUpdate lda.cpp
Suleyman TURKMEN [Sun, 13 Mar 2016 19:11:34 +0000 (21:11 +0200)]
Update lda.cpp

typo correction

8 years agoMerge pull request #6096 from mnoskova:mn/SVMSGD_to_opencv3_0
Vadim Pisarevsky [Sat, 12 Mar 2016 17:16:35 +0000 (17:16 +0000)]
Merge pull request #6096 from mnoskova:mn/SVMSGD_to_opencv3_0

8 years agoMerge pull request #6025 from sovrasov:new_python_tests
Vadim Pisarevsky [Sat, 12 Mar 2016 17:11:19 +0000 (17:11 +0000)]
Merge pull request #6025 from sovrasov:new_python_tests

8 years agoMerge pull request #6119 from mshabunin:hal_filter2d
Vadim Pisarevsky [Sat, 12 Mar 2016 17:08:10 +0000 (17:08 +0000)]
Merge pull request #6119 from mshabunin:hal_filter2d

8 years agoMerge pull request #6137 from dtmoodie:thrust_allocator
Vadim Pisarevsky [Sat, 12 Mar 2016 17:07:03 +0000 (17:07 +0000)]
Merge pull request #6137 from dtmoodie:thrust_allocator

8 years agoMerge pull request #6206 from alalek:polar_fix
Vadim Pisarevsky [Sat, 12 Mar 2016 16:40:35 +0000 (16:40 +0000)]
Merge pull request #6206 from alalek:polar_fix

8 years agoMerge pull request #6241 from cbalint13:agast
Vadim Pisarevsky [Sat, 12 Mar 2016 16:38:39 +0000 (16:38 +0000)]
Merge pull request #6241 from cbalint13:agast

8 years agoFix AGAST keypoint declared size.
Balint Cristian [Sat, 12 Mar 2016 14:49:14 +0000 (16:49 +0200)]
Fix AGAST keypoint declared size.

8 years agoMerge pull request #6232 from piotr-semenov:semenovp_fixes
Alexander Alekhin [Fri, 11 Mar 2016 12:23:41 +0000 (12:23 +0000)]
Merge pull request #6232 from piotr-semenov:semenovp_fixes

8 years agoMerge pull request #6224 from alalek:fix_java_binary
Alexander Alekhin [Thu, 10 Mar 2016 17:03:43 +0000 (17:03 +0000)]
Merge pull request #6224 from alalek:fix_java_binary

8 years agoMerge pull request #6208 from alalek:templates
Maksim Shabunin [Thu, 10 Mar 2016 11:35:30 +0000 (11:35 +0000)]
Merge pull request #6208 from alalek:templates

8 years agoFix that corrects the OpenCV's random access iterator distance: d(x,y) = -d(y,x)
Piotr Semenov [Thu, 10 Mar 2016 08:58:32 +0000 (11:58 +0300)]
Fix that corrects the OpenCV's random access iterator distance: d(x,y) = -d(y,x)

8 years agoMerge pull request #6217 from krrishnarraj:master
Alexander Alekhin [Wed, 9 Mar 2016 09:42:17 +0000 (09:42 +0000)]
Merge pull request #6217 from krrishnarraj:master

8 years agorevert: java bindings become CMake modules (loadable plugins)
Alexander Alekhin [Wed, 9 Mar 2016 09:12:30 +0000 (12:12 +0300)]
revert: java bindings become CMake modules (loadable plugins)

This reverts part of commit 0db10a3052a33c7326517e8140e36d46d430a3f5

8 years agoUse AKAZE detector instead of ORB in feature_homography test
Vladislav Sovrasov [Wed, 9 Mar 2016 08:37:25 +0000 (11:37 +0300)]
Use AKAZE detector instead of ORB in feature_homography test

8 years agofix: bg substraction for float images with OpenCL
Matthieu FT [Mon, 1 Feb 2016 15:24:28 +0000 (16:24 +0100)]
fix: bg substraction for float images with OpenCL

8 years agogcc6: fix misleading indentation warning
Krishnaraj Bhat [Mon, 7 Mar 2016 11:36:16 +0000 (17:06 +0530)]
gcc6: fix misleading indentation warning

cosmetic changes to fix this warning.
real bugs not found

8 years agoAdds supports for the majority of features2d to the Java wrappers:
Jason von Nieda [Sun, 6 Mar 2016 21:49:44 +0000 (13:49 -0800)]
Adds supports for the majority of features2d to the Java wrappers:
* Adds the main features2d header to the parse list for the generator.
* Removes the manual definition of drawKeypoints and drawMatches since these are now included in the main header.
* Updates the generator to ignore SimpleBlobDetector, FlannBasedMatcher and DescriptorMatcher as these cause conflicts with the generator. This is okay since these were not previously included in the distribution anyway, so no harm is done.

8 years agomove GitHub templates into .github folder
Alexander Alekhin [Fri, 4 Mar 2016 11:20:25 +0000 (14:20 +0300)]
move GitHub templates into .github folder

8 years agoMerge pull request #6207 from StevenPuttemans:fix_annotation
Alexander Alekhin [Fri, 4 Mar 2016 11:02:19 +0000 (11:02 +0000)]
Merge pull request #6207 from StevenPuttemans:fix_annotation

8 years agomissing break statement
StevenPuttemans [Fri, 4 Mar 2016 08:41:13 +0000 (09:41 +0100)]
missing break statement

8 years agoMerge pull request #6118 from Emoters:hotfix/planar_tutorial_fixes
Alexander Alekhin [Thu, 3 Mar 2016 17:24:08 +0000 (17:24 +0000)]
Merge pull request #6118 from Emoters:hotfix/planar_tutorial_fixes

8 years agoMerge pull request #6144 from Dikay900:patch-2
Alexander Alekhin [Thu, 3 Mar 2016 17:23:00 +0000 (17:23 +0000)]
Merge pull request #6144 from Dikay900:patch-2

8 years agoMerge pull request #6145 from Dikay900:patch-3
Alexander Alekhin [Thu, 3 Mar 2016 17:17:25 +0000 (17:17 +0000)]
Merge pull request #6145 from Dikay900:patch-3

8 years agoMerge pull request #6205 from Aravind-Suresh:vs-za-option-bug-fix
Alexander Alekhin [Thu, 3 Mar 2016 16:23:46 +0000 (16:23 +0000)]
Merge pull request #6205 from Aravind-Suresh:vs-za-option-bug-fix

8 years agologPolar/linearPolar: more accurate processing near zero angle slice
Alexander Alekhin [Thu, 3 Mar 2016 15:34:02 +0000 (18:34 +0300)]
logPolar/linearPolar: more accurate processing near zero angle slice

8 years agoAdded separate hal::SepFilter2D class
Maksim Shabunin [Thu, 3 Mar 2016 15:55:47 +0000 (18:55 +0300)]
Added separate hal::SepFilter2D class

8 years agoHAL Filter2D interface: Updated according to comments
Maksim Shabunin [Tue, 1 Mar 2016 15:48:41 +0000 (18:48 +0300)]
HAL Filter2D interface: Updated according to comments

8 years agoFixed build with older standalone IPP versions
Maksim Shabunin [Wed, 24 Feb 2016 16:31:22 +0000 (19:31 +0300)]
Fixed build with older standalone IPP versions

8 years agoFixed build with older ippicv
Maksim Shabunin [Sat, 20 Feb 2016 09:29:23 +0000 (12:29 +0300)]
Fixed build with older ippicv

8 years agoFilter2D HAL interface
Maksim Shabunin [Thu, 4 Feb 2016 16:16:05 +0000 (19:16 +0300)]
Filter2D HAL interface

8 years agofix logPolar/linearPolar
Alexander Alekhin [Thu, 3 Mar 2016 15:04:33 +0000 (18:04 +0300)]
fix logPolar/linearPolar

8 years agoFixed VS 2010 and option Za bug.
aravind [Thu, 3 Mar 2016 12:12:47 +0000 (17:42 +0530)]
Fixed VS 2010 and option Za bug.

8 years agoadd link to http://answers.opencv.org for questions
Philip [Thu, 3 Mar 2016 11:40:16 +0000 (12:40 +0100)]
add link to answers.opencv.org for questions

8 years agoMerge pull request #6201 from paroj:gst_noconvert
Alexander Alekhin [Thu, 3 Mar 2016 11:36:05 +0000 (11:36 +0000)]
Merge pull request #6201 from paroj:gst_noconvert

8 years agoFix warnings in python3
Vladislav Sovrasov [Wed, 24 Feb 2016 10:09:42 +0000 (13:09 +0300)]
Fix warnings in python3

8 years agoAdd segmentation and object tracking python tests
Vladislav Sovrasov [Fri, 12 Feb 2016 12:55:06 +0000 (15:55 +0300)]
Add segmentation and object tracking python tests

8 years agoChanges in facedetect test
Vladislav Sovrasov [Fri, 5 Feb 2016 15:46:43 +0000 (18:46 +0300)]
Changes in facedetect test

8 years agoImprovements in tests, bugfix in digits_video sample
Vladislav Sovrasov [Fri, 5 Feb 2016 14:46:52 +0000 (17:46 +0300)]
Improvements in tests, bugfix in digits_video sample

8 years agoFixes in calibration and camshift tests
Vladislav Sovrasov [Thu, 4 Feb 2016 14:38:05 +0000 (17:38 +0300)]
Fixes in calibration and camshift tests

8 years agoAdd 2 new tests, bugfixed in old tests
Vladislav Sovrasov [Thu, 4 Feb 2016 14:12:32 +0000 (17:12 +0300)]
Add 2 new tests, bugfixed in old tests

8 years agoFix py3 comatibility
Vladislav Sovrasov [Wed, 3 Feb 2016 10:23:43 +0000 (13:23 +0300)]
Fix py3 comatibility