Commit Graph

13656 Commits

Author SHA1 Message Date
Maksim Shabunin
49b4af1e5c Merge pull request #6395 from Tauranis:master 2016-04-13 07:53:33 +00:00
Maksim Shabunin
d8629b0fa4 Merge pull request #6335 from themightyoarfish:canny_kernel_sz_fix 2016-04-13 07:52:05 +00:00
Maksim Shabunin
fc9f7cc925 Merge pull request #6375 from ohnozzy:Bug-Fix-for-Issue-6288 2016-04-13 07:51:33 +00:00
Philipp Hasper
cc7a1a2ab7 Deactivated two noisy camera-retrieval log messages in android
They were issued for every frame retrieved - even in a release build.
2016-04-13 09:17:33 +02:00
Tauranis
edb6a0e889 Bug fix for MLP predict for small values to avoid nan responses. 2016-04-12 15:59:32 -03:00
Alexander Alekhin
9744073b95 videoio: give chance for all enabled backends
"Eat" unexpected backend exceptions
2016-04-12 20:05:21 +03:00
Maksim Shabunin
8f6e102331 Merge pull request #6345 from eduardohenriquearnold:master 2016-04-12 15:22:32 +00:00
Vitaly Tuzov
13858cd561 Cost estimation boundaries description updated 2016-04-12 17:31:12 +03:00
Vitaly Tuzov
772d9689e9 Backport of StereoBM uninitialized memory access problem fix from master branch 2016-04-12 17:27:16 +03:00
ohnozzy
9dd962ca1a Bug Fix for Issue 6288
Added 2 inline functions in persistence.hpp
So that the '>>' operator works correctly for std::Vector<KeyPoint> and
std::Vector<DMatch>
2016-04-12 21:40:50 +08:00
Maksim Shabunin
1307bb1d03 Merge pull request #6314 from mvukad:bugfix_dtreeswrite 2016-04-12 13:26:25 +00:00
Alexander Alekhin
2b29db860c Merge pull request #6391 from virtuald:v4l-device-name 2016-04-12 12:57:21 +00:00
Pavel Rojtberg
91678ff828 cap_v4l: allow manually controlling exposure 2016-04-12 12:10:54 +02:00
Maksim Shabunin
ff3bb9f4e6 Merge pull request #6383 from alalek:backport_6381 2016-04-12 08:40:01 +00:00
Dustin Spicuzza
e489f29d0f v4l/libv4l: allow opening device by name
- Allows using non-default device names such as /dev/v4l/by-path/pci-0000:00:1d.0-usb-0:1.1:1.0-video-index0
2016-04-12 01:25:34 -04:00
Maksim Shabunin
70bc268c1a Fixed problem with nonfree python test: could not find local test images 2016-04-11 18:45:14 +03:00
Andreas Franek
1b3a967223 Enable directly writing jpeg-encoded streams with GStreamer
CvVideoWriter_GStreamer assumes a JPEG encoded stream if the height of
the given frame size is 1.
2016-04-11 17:10:57 +02:00
Philipp Hasper
b6d8c9d990 operator<< handles keys starting with underscore 2016-04-11 12:43:58 +03:00
Philipp Hasper
47c4ee974a operator<< handles keys starting with underscore 2016-04-11 09:55:33 +02:00
Maksim Shabunin
233612efd7 Reworked HAL dft/dct interface, added replacement documentation 2016-04-08 16:03:51 +03:00
Maksim Shabunin
f40d701427 DFT: renamed HAL functions 2016-04-08 11:19:28 +03:00
Maksim Shabunin
15783cf668 Always use hal::dft in crossCorr function 2016-04-08 11:19:28 +03:00
Maksim Shabunin
008abd28fd Extracted HAL interfaces for DFT/DCT, added new test 2016-04-08 11:19:28 +03:00
Vitaly Tuzov
a7ce9a176b Fixed uninitialized memory errors in stereoBM 2016-04-07 23:58:17 +03:00
mvukad
695e33b25b Fix missing format when writing Algorithm-based objects
Added a writeFormat() method to Algorithm which must be called by the
write() method of derived classes.
2016-04-07 13:49:42 -07:00
Maksim Shabunin
5877debb6f HAL resize, warpAffine, warpPerspective interface
- added HAL documentation support
- added documentation to HAL replacement interface
- updated several HAL functions in imgproc module
2016-04-07 18:47:24 +03:00
shengyu
2d41321ca0 fix quote 2016-04-06 14:31:06 +08:00
Alexander Alekhin
52ba3778e3 Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24 2016-04-05 16:29:15 +00:00
Alexander Alekhin
1f7fea9092 Merge pull request #6244 from dreifachstein:topic-cmake-install 2016-04-05 15:23:55 +00:00
Vitaly Tuzov
34b3d31f54 Fix for nonlocal data requirement in test2.py 2016-04-05 16:47:29 +03:00
Alexander Alekhin
6f139b4f8e ffmpeg: interrupt callback fix
backport from master
2016-04-05 14:19:44 +03:00
Alexander Alekhin
7d9a480597 ffmpeg: interrupt callback fix 2016-04-04 13:17:04 +03:00
Vadim Pisarevsky
46d218bcec Merge pull request #6312 from KnockSoftware:split-float-epsilon 2016-04-03 23:10:10 +00:00
Maksim Shabunin
0c068768a5 Merge pull request #6351 from mshabunin:fix_java_moments 2016-04-01 09:19:09 +00:00
shengyu
21513caf3f missing right quote 2016-04-01 11:03:50 +08:00
Alexander Alekhin
873884aa47 Merge pull request #6346 from filipsladek:box_filter_32FC1 2016-03-31 17:06:52 +00:00
Alexander Alekhin
ab3fb8b2f8 Merge pull request #6340 from BloodAxe:parallel_logistic_regression 2016-03-31 17:06:20 +00:00
Maksim Shabunin
a5af69de6a Java wrapper for moments: do not truncate values in set method 2016-03-31 12:57:10 +03:00
filipsladek
a821fde44e add performance test for CV_32FC1 2016-03-31 09:05:02 +02:00
Alexander Alekhin
a056c9b113 Merge pull request #6329 from paroj:window_gui_cpp 2016-03-30 14:34:55 +00:00
filipsladek
f635381662 add testcase for CV_32FC1 2016-03-30 10:38:22 +02:00
filipsladek
493ac1df37 code style 2016-03-29 22:44:03 +02:00
filipsladek
9c3f790edb Box filter implemented for CV_32FC1 2016-03-29 22:30:49 +02:00
Eduardo Arnold
d046602ea4 Enforced DecisionFunction vector indexes to be saved on SVM save/load methods 2016-03-29 16:35:27 -03:00
Vitaly Tuzov
64f02aa72d Backport of setRNGSeed implementation and python test randomness fix 2016-03-29 18:05:28 +03:00
Alexander Alekhin
ff0d115800 Merge pull request #6332 from sovrasov:python_rng_seed 2016-03-29 14:23:26 +00:00
Roman Donchenko
97ac59cb73 Fix a memory leak indirectly caused by cvDestroyWindow 2016-03-29 14:06:05 +03:00
Eugene Khvedchenya
ee92a36123 Added parallel implementation of compute_gradient method. 2016-03-29 11:09:54 +03:00
Vladislav Sovrasov
72ed4173df Change setRNGSeed implementaion 2016-03-29 10:54:42 +03:00
Evan Heidtmann
0712bccf52 Fix epsilon comparison when splitting 2016-03-28 14:16:32 -07:00
themightyoarfish
68d97502fe Error message for wrong kernel size was insufficient.
When setting a wrong kernel size, the error message only tells the user that it
must be odd, however the conditions for rejection include values > 7 which must
be communicated. Without that, the message would be incorrect and confusing if
the user is unaware that only values 3, 5, 7 are accepted.
2016-03-28 14:06:55 +02:00
Alexander Alekhin
ee123b8a9e Merge pull request #6311 from peters:master 2016-03-26 19:55:17 +00:00
Vladislav Sovrasov
362d52a3cb Fix doxygen warnings 2016-03-25 16:34:45 +03:00
Vladislav Sovrasov
a490b64e9b Add function setRNGSeed and seed setup in python tests 2016-03-25 16:17:58 +03:00
Alexander Alekhin
05384f05cc Merge pull request #6313 from amannababanana:master 2016-03-25 11:31:17 +00:00
Pavel Rojtberg
0ac31a0bd7 highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings 2016-03-24 23:58:47 +01:00
Vitaly Tuzov
ea3746bd15 Made texture flow python test less strict to fix it on AARCH64 2016-03-23 20:07:42 +03:00
Pavel Rojtberg
9dc14b3efc cap_gst: inspect sink instead of videoconvert to find out properties
videoconvert might not be present on a manual pipeline, but appsink must
be.
2016-03-23 16:24:10 +01:00
Vadim Pisarevsky
e792ee89de Merge pull request #6243 from mshabunin:hal_morph 2016-03-23 13:09:19 +00:00
Vadim Pisarevsky
e547916e88 Merge pull request #6285 from sovrasov:python_tests_cleanup 2016-03-23 13:07:00 +00:00
Lucas Solomon
d2d5d32fe0 remove trailing whitespace 2016-03-22 22:31:16 -07:00
Lucas Solomon
688b4d9d7a return 0 from VideoCapture::read() when cannot connect to camera 2016-03-22 19:03:28 -07:00
Peter Rekdal Sunde
278747ba45 Add support for ffmpeg 3.0. 2016-03-22 22:52:35 +01:00
Maksim Shabunin
f3127521f3 Merge pull request #6214 from vonnieda:java_features2d 2016-03-21 11:51:11 +00:00
Alexander Alekhin
a4e35d83ff Merge pull request #6267 from dtmoodie:issue_5918 2016-03-21 09:37:11 +00:00
Maksim Shabunin
3b6190dfad Merge pull request #6150 from lvv:fix-6149-applColorMap 2016-03-21 09:20:52 +00:00
Maksim Shabunin
83379695a0 HAL interface for morphology operations 2016-03-21 09:32:06 +03:00
Leonid Volnitsky
bebab8d647 fix: 6149 (through CV_Error on wrong image type) 2016-03-19 19:57:05 +02:00
Xiaolei Yu
40eb613bbf Make install paths relative to CMAKE_INSTALL_PREFIX 2016-03-19 16:41:51 +08:00
Vitaly Tuzov
24361733e4 Fixed face detection python test 2016-03-18 17:44:45 +03:00
Alexander Alekhin
4e479d58f8 Merge pull request #6290 from dtmoodie:thrust_allocator_usage_pr 2016-03-18 12:14:20 +00:00
Vladislav Sovrasov
fd61978795 Add goodfeatures python test and cleanup in test directory 2016-03-18 11:16:08 +03:00
Dan
da189ce1e0 Fixed regression in cv::VideoCapture with gstreamer back end that prevented viewing of rtsp streams. 2016-03-17 13:03:48 -04:00
Alexander Smorkalov
b8ce65bec8 Merge pull request #6279 from terfendail:vt/pythontest_data 2016-03-17 12:27:12 +00:00
Alexander Alekhin
2f4e38c831 Merge pull request #6283 from jlubawy:vfw-surface4-fix 2016-03-17 11:08:12 +00:00
Vitaly Tuzov
96903dc4ad Test data necessary for python samples added to test package.
Test launch script updated to run new tests as well.
2016-03-17 11:38:40 +03:00
Josh Lubawy
1bd8bcbdd9 Remove cstdio debug 2016-03-17 01:00:49 -07:00
Josh Lubawy
f715e5b0b2 Add support for YUV 4:2:0 NV12 frame format in VFW camera capture 2016-03-16 23:38:17 -07:00
Roman Donchenko
eb40afa26a Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
I delete the LIBAVFORMAT_BUILD < 5231 branch, because I couldn't even find FFmpeg with
such a small build number, let alone test with it.
2016-03-16 20:04:33 +03:00
Roman Donchenko
421fcf9e35 Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability 2016-03-16 16:28:59 +03:00
Robbert Klarenbeek
81b11ee463 Replace deprecated malloc.h 2016-03-16 11:37:27 +01:00
Roman Donchenko
9a5d7f1a0b Backport PR #3813 to 2.4
It has already been partially backported by #6199; this commit completes
the backport.
2016-03-16 12:34:41 +03:00
Robbert Klarenbeek
dd510e1de9 Fix incompatibility with some C++11 implementations 2016-03-15 17:21:05 +01:00
Dan
1d21493302 Merge branch 'issue_6251' of http://github.com/dtmoodie/opencv into thrust_allocator_usage_pr 2016-03-15 11:18:41 -04:00
Dan
a21ede9452 Thrust allocator usage. 2016-03-15 11:14:47 -04:00
Dan
7a934f9ee0 Compatibility and bug fixes. 2016-03-15 11:14:42 -04:00
Dan
a8ca560684 Fixed more missing async calls. 2016-03-15 11:14:42 -04:00
Dan
79ecefb51f Implemented async calls. 2016-03-15 11:14:41 -04:00
Zhigang Gong
0b08d2559e 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>
2016-03-15 19:11:15 +08:00
Dan
42c36c0c80 Linux bug fix for ThrustAllocator. 2016-03-14 11:09:52 -04:00
Alexander Alekhin
7783206934 Merge pull request #6259 from polevoy-d-v:move_sematics_fix 2016-03-14 14:46:21 +00:00
Прун Виктор
a90a576d76 fixed incorrect behaviour of move semantics for cv::Ptr, cv::Mat, cv::UMat in case when rvalue-reference references to *this. 2016-03-14 16:10:23 +03:00
Alexander Alekhin
708761b219 Merge pull request #6253 from berak:patch-1 2016-03-14 11:27:11 +00:00
Alexander Alekhin
4f9e1a9a58 Merge pull request #6249 from sturkmen72:patch-15 2016-03-14 11:26:51 +00:00
Alexander Alekhin
9d49cef29e Merge pull request #6245 from delftswa2016:fix-for-issue-4375 2016-03-14 11:26:33 +00:00
Alexander Alekhin
cc3433f349 Merge pull request #6045 from matthieu-ft:master 2016-03-14 11:25:23 +00:00
berak
4555f9ac25 svmsgd.cpp, fix #6248
add a cast to double, to make vs compilers happy
2016-03-14 08:02:09 +01:00
Suleyman TURKMEN
826b5a2ef1 Update lda.cpp
typo correction
2016-03-13 21:11:34 +02:00
shruthikashyap
1fbc6ab05d Adding the syntax and usage for cv2.undistortPoints(). 2016-03-13 13:32:24 +01:00
Vadim Pisarevsky
fbc221d334 Merge pull request #6096 from mnoskova:mn/SVMSGD_to_opencv3_0 2016-03-12 17:16:35 +00:00