platform/upstream/opencv.git
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 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 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

8 years agoUpdate letter_recog sample to current version of opencv interfaces
Vladislav Sovrasov [Wed, 3 Feb 2016 08:22:32 +0000 (11:22 +0300)]
Update letter_recog sample to current version of opencv interfaces

8 years agoFix mouse control in asift and find_obj samples
Vladislav Sovrasov [Wed, 3 Feb 2016 08:20:06 +0000 (11:20 +0300)]
Fix mouse control in asift and find_obj samples

8 years agoFix rectangle selection in some of python samples
Vladislav Sovrasov [Tue, 2 Feb 2016 11:16:49 +0000 (14:16 +0300)]
Fix rectangle selection in some of python samples

8 years agoAdd dft python test, fix platform depended result in morphology test
Vladislav Sovrasov [Fri, 29 Jan 2016 15:00:18 +0000 (18:00 +0300)]
Add dft python test, fix platform depended result in morphology test

8 years agoAdd morphology python test, fix python3 compabtibility in kmeans test
Vladislav Sovrasov [Fri, 29 Jan 2016 10:07:08 +0000 (13:07 +0300)]
Add morphology python test, fix python3 compabtibility in kmeans test

8 years agoAdd k-means python test, fix loading images in calibration test
Vladislav Sovrasov [Thu, 28 Jan 2016 15:50:09 +0000 (18:50 +0300)]
Add k-means python test, fix loading images in calibration test

8 years agoFix loading images in python tests
Vladislav Sovrasov [Thu, 28 Jan 2016 14:13:58 +0000 (17:13 +0300)]
Fix loading images in python tests

8 years agoAdd new tests on python
Vladislav Sovrasov [Thu, 28 Jan 2016 12:43:08 +0000 (15:43 +0300)]
Add new tests on python

8 years agoGStreamer: allow reading raw MJPEG data
Pavel Rojtberg [Wed, 2 Mar 2016 16:22:49 +0000 (17:22 +0100)]
GStreamer: allow reading raw MJPEG data

8 years agoMerge pull request #6193 from trombipeti:Fix_#6192
Alexander Alekhin [Wed, 2 Mar 2016 15:19:01 +0000 (15:19 +0000)]
Merge pull request #6193 from trombipeti:Fix_#6192

8 years agoMerge pull request #6160 from paroj:fe_distort
Vadim Pisarevsky [Wed, 2 Mar 2016 13:34:32 +0000 (13:34 +0000)]
Merge pull request #6160 from paroj:fe_distort

8 years agoMerge pull request #6161 from mshabunin:fix-mac-sliders
Vadim Pisarevsky [Wed, 2 Mar 2016 13:33:45 +0000 (13:33 +0000)]
Merge pull request #6161 from mshabunin:fix-mac-sliders

8 years agoMerge pull request #6194 from eladj:subdiv2d_documentation
Vadim Pisarevsky [Wed, 2 Mar 2016 13:31:43 +0000 (13:31 +0000)]
Merge pull request #6194 from eladj:subdiv2d_documentation

8 years agoAdded param documentation
Elad Joseph [Wed, 2 Mar 2016 06:55:53 +0000 (08:55 +0200)]
Added param documentation

Added param description to remove doxygen warning

8 years agoAdded Subdiv2D class documentation
Elad Joseph [Tue, 1 Mar 2016 21:08:48 +0000 (23:08 +0200)]
Added Subdiv2D class documentation

Added documentation to the Subdiv2D documentation, based on the previous
C API.

8 years agoFix for #6192 (Mismatching delete)
Péter Trombitás [Tue, 1 Mar 2016 20:40:05 +0000 (21:40 +0100)]
Fix for #6192 (Mismatching delete)

8 years agoMerge pull request #6190 from berak:fix_ml_python_tutorial
Alexander Alekhin [Tue, 1 Mar 2016 14:05:42 +0000 (14:05 +0000)]
Merge pull request #6190 from berak:fix_ml_python_tutorial

8 years agofix python ml tutorials
berak [Mon, 29 Feb 2016 21:26:13 +0000 (22:26 +0100)]
fix python ml tutorials

8 years agoMerge remote-tracking branch 'refs/remotes/Itseez/master'
Elad Joseph [Mon, 29 Feb 2016 19:48:30 +0000 (21:48 +0200)]
Merge remote-tracking branch 'refs/remotes/Itseez/master'

8 years agoMerge pull request #6148 from Aravind-Suresh:cv-cuda-reduce-bug-fix
Alexander Alekhin [Mon, 29 Feb 2016 19:07:05 +0000 (19:07 +0000)]
Merge pull request #6148 from Aravind-Suresh:cv-cuda-reduce-bug-fix

8 years agoMerge pull request #6181 from delftswa2016:fix-for-issue-6146
Alexander Alekhin [Mon, 29 Feb 2016 15:13:39 +0000 (15:13 +0000)]
Merge pull request #6181 from delftswa2016:fix-for-issue-6146

8 years agoMerge pull request #6174 from alalek:fix_python_msvs
Alexander Alekhin [Mon, 29 Feb 2016 11:51:34 +0000 (11:51 +0000)]
Merge pull request #6174 from alalek:fix_python_msvs

8 years agoFix for issue 6146 and some grammar corrections
shruthikashyap [Sat, 27 Feb 2016 22:26:23 +0000 (23:26 +0100)]
Fix for issue 6146 and some grammar corrections

8 years agoFix for issue 6146
shruthikashyap [Sat, 27 Feb 2016 22:16:52 +0000 (23:16 +0100)]
Fix for issue 6146

8 years agoFixed cv::cuda::reduce bug.
aravind [Fri, 26 Feb 2016 10:14:20 +0000 (15:44 +0530)]
Fixed cv::cuda::reduce bug.

8 years agocmake: fix cv2.lib conflict for python2/3 bindings (MSVS)
Alexander Alekhin [Fri, 26 Feb 2016 14:08:07 +0000 (17:08 +0300)]
cmake: fix cv2.lib conflict for python2/3 bindings (MSVS)

8 years agoFixed documentation.
Marina Noskova [Fri, 26 Feb 2016 11:40:23 +0000 (14:40 +0300)]
Fixed documentation.

8 years agoDeleted default value for parameters in docs.
Marina Noskova [Thu, 25 Feb 2016 16:12:54 +0000 (19:12 +0300)]
Deleted default value for parameters in docs.
Added some asserts.

8 years agoDeleted functions makeTrainData() and makeTestData() in test_svmsgd.cpp.
Marina Noskova [Thu, 25 Feb 2016 13:57:03 +0000 (16:57 +0300)]
Deleted functions makeTrainData() and makeTestData() in test_svmsgd.cpp.
Added function makeData() in test_svmsgd.cpp.

8 years agoDelete function areClassesEmpty().
Marina Noskova [Thu, 25 Feb 2016 12:31:07 +0000 (15:31 +0300)]
Delete function areClassesEmpty().

8 years agoMerge pull request #6139 from ioxp:master
Alexander Alekhin [Thu, 25 Feb 2016 11:41:49 +0000 (11:41 +0000)]
Merge pull request #6139 from ioxp:master

8 years agoMerge pull request #6166 from mshabunin:fix-exif-fds-leak
Alexander Alekhin [Thu, 25 Feb 2016 11:11:28 +0000 (11:11 +0000)]
Merge pull request #6166 from mshabunin:fix-exif-fds-leak

8 years agoEXIF reader: fixed file descriptor leak in case of broken tags
Maksim Shabunin [Thu, 25 Feb 2016 09:19:11 +0000 (12:19 +0300)]
EXIF reader: fixed file descriptor leak in case of broken tags

8 years agoAdded build warnings in case of macro definition conflicts
Maksim Shabunin [Thu, 25 Feb 2016 08:04:23 +0000 (11:04 +0300)]
Added build warnings in case of macro definition conflicts

8 years agoCocoa backend: added checks before accessing sliders dictionary
Maksim Shabunin [Wed, 24 Feb 2016 16:40:50 +0000 (19:40 +0300)]
Cocoa backend: added checks before accessing sliders dictionary

8 years agoclarify how to use fisheye::distortPoints
Pavel Rojtberg [Wed, 24 Feb 2016 14:44:32 +0000 (15:44 +0100)]
clarify how to use fisheye::distortPoints

8 years agoFixed documentation.
Marina Noskova [Wed, 24 Feb 2016 11:41:51 +0000 (14:41 +0300)]
Fixed documentation.

8 years agoFixed documentation.
Marina Noskova [Wed, 24 Feb 2016 10:33:43 +0000 (13:33 +0300)]
Fixed documentation.

8 years agoRename parameters lambda, gamma0 and c.
Marina Noskova [Wed, 24 Feb 2016 10:22:07 +0000 (13:22 +0300)]
Rename parameters lambda, gamma0 and c.

8 years agoCreate a Pull Request template
Philip [Fri, 19 Feb 2016 13:29:59 +0000 (14:29 +0100)]
Create a Pull Request template

In addition to the Issue template which is far more important i would like to add this so issues will get closed after merging related PRs rather than being reliant on the reviewer.
If someone want to add something here feel free.

8 years agoAdd an Issue template for new issues
Philip [Fri, 19 Feb 2016 12:19:51 +0000 (13:19 +0100)]
Add an Issue template for new issues

Since we've got a new feature here on github i would like to use it to get all relevant information into the reported issues.
https://help.github.com/articles/creating-an-issue-template-for-your-repository/

I started a file but i would like to hear some other options about what to add.

add "steps to reproduce" if no code example is applicable

change to comments from alalek

8 years agoMerge pull request #6141 from Aravind-Suresh:fisheye-documentation-fix
Alexander Alekhin [Fri, 19 Feb 2016 07:29:18 +0000 (07:29 +0000)]
Merge pull request #6141 from Aravind-Suresh:fisheye-documentation-fix