Maksim Shabunin [Tue, 12 Apr 2016 15:22:32 +0000 (15:22 +0000)]
Merge pull request #6345 from eduardohenriquearnold:master
Maksim Shabunin [Tue, 12 Apr 2016 13:26:25 +0000 (13:26 +0000)]
Merge pull request #6314 from mvukad:bugfix_dtreeswrite
Alexander Alekhin [Tue, 12 Apr 2016 12:57:21 +0000 (12:57 +0000)]
Merge pull request #6391 from virtuald:v4l-device-name
Dustin Spicuzza [Tue, 12 Apr 2016 05:00:37 +0000 (01:00 -0400)]
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
Alexander Alekhin [Mon, 11 Apr 2016 17:19:11 +0000 (17:19 +0000)]
Merge pull request #6298 from andy-held:master
Andreas Franek [Fri, 18 Mar 2016 17:02:19 +0000 (18:02 +0100)]
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.
Alexander Alekhin [Mon, 11 Apr 2016 09:40:09 +0000 (09:40 +0000)]
Merge pull request #6381 from ioxp:persistenceFix
Philipp Hasper [Mon, 11 Apr 2016 07:55:33 +0000 (09:55 +0200)]
operator<< handles keys starting with underscore
mvukad [Tue, 22 Mar 2016 22:19:42 +0000 (15:19 -0700)]
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.
Alexander Alekhin [Wed, 6 Apr 2016 11:17:35 +0000 (11:17 +0000)]
Merge pull request #6367 from shengyu7697:fix_quote
shengyu [Wed, 6 Apr 2016 06:31:06 +0000 (14:31 +0800)]
fix quote
Alexander Alekhin [Wed, 6 Apr 2016 04:51:58 +0000 (04:51 +0000)]
Merge pull request #6265 from huang-qiao:master
qiao [Mon, 21 Mar 2016 13:38:10 +0000 (21:38 +0800)]
fix OpenCV_CONFIG_PATH get null value after CMake 2.8.11
syntax of cmake "get_filename_component" changed after version 2.8.11
for cmake version < 2.8.11
get_filename_component(<VAR> <FileName> PATH [CACHE])
for cmake version >= 2.8.11
get_filename_component(<VAR> <FileName> DIRECTORY [CACHE])
Update OpenCVConfig.cmake
Update OpenCVConfig.cmake.in
Alexander Alekhin [Tue, 5 Apr 2016 15:23:55 +0000 (15:23 +0000)]
Merge pull request #6244 from dreifachstein:topic-cmake-install
Alexander Alekhin [Tue, 5 Apr 2016 11:07:00 +0000 (11:07 +0000)]
Merge pull request #6358 from alalek:ffmpeg_fix_timeout
Alexander Alekhin [Mon, 4 Apr 2016 10:08:52 +0000 (13:08 +0300)]
ffmpeg: interrupt callback fix
Vadim Pisarevsky [Sun, 3 Apr 2016 23:10:10 +0000 (23:10 +0000)]
Merge pull request #6312 from KnockSoftware:split-float-epsilon
Maksim Shabunin [Fri, 1 Apr 2016 09:19:09 +0000 (09:19 +0000)]
Merge pull request #6351 from mshabunin:fix_java_moments
Maksim Shabunin [Fri, 1 Apr 2016 09:18:41 +0000 (09:18 +0000)]
Merge pull request #6353 from shengyu7697:fix_right_quote
shengyu [Fri, 1 Apr 2016 03:03:50 +0000 (11:03 +0800)]
missing right quote
Alexander Alekhin [Thu, 31 Mar 2016 17:06:52 +0000 (17:06 +0000)]
Merge pull request #6346 from filipsladek:box_filter_32FC1
Alexander Alekhin [Thu, 31 Mar 2016 17:06:20 +0000 (17:06 +0000)]
Merge pull request #6340 from BloodAxe:parallel_logistic_regression
Maksim Shabunin [Thu, 31 Mar 2016 09:57:10 +0000 (12:57 +0300)]
Java wrapper for moments: do not truncate values in set method
filipsladek [Thu, 31 Mar 2016 07:05:02 +0000 (09:05 +0200)]
add performance test for CV_32FC1
Alexander Alekhin [Wed, 30 Mar 2016 14:34:54 +0000 (14:34 +0000)]
Merge pull request #6329 from paroj:window_gui_cpp
filipsladek [Wed, 30 Mar 2016 08:38:22 +0000 (10:38 +0200)]
add testcase for CV_32FC1
filipsladek [Tue, 29 Mar 2016 20:44:03 +0000 (22:44 +0200)]
code style
filipsladek [Tue, 29 Mar 2016 20:30:49 +0000 (22:30 +0200)]
Box filter implemented for CV_32FC1
Eduardo Arnold [Tue, 29 Mar 2016 19:29:41 +0000 (16:29 -0300)]
Enforced DecisionFunction vector indexes to be saved on SVM save/load methods
Alexander Alekhin [Tue, 29 Mar 2016 14:23:26 +0000 (14:23 +0000)]
Merge pull request #6332 from sovrasov:python_rng_seed
Eugene Khvedchenya [Tue, 29 Mar 2016 08:09:54 +0000 (11:09 +0300)]
Added parallel implementation of compute_gradient method.
Vladislav Sovrasov [Tue, 29 Mar 2016 07:54:42 +0000 (10:54 +0300)]
Change setRNGSeed implementaion
Evan Heidtmann [Tue, 22 Mar 2016 00:33:36 +0000 (17:33 -0700)]
Fix epsilon comparison when splitting
Vadim Pisarevsky [Sun, 27 Mar 2016 08:06:24 +0000 (08:06 +0000)]
Merge pull request #6321 from mshabunin:hal_cmake
Vadim Pisarevsky [Sun, 27 Mar 2016 08:03:28 +0000 (08:03 +0000)]
Merge pull request #6326 from sovrasov:python_samples_update
Alexander Alekhin [Sat, 26 Mar 2016 19:55:17 +0000 (19:55 +0000)]
Merge pull request #6311 from peters:master
Vladislav Sovrasov [Fri, 25 Mar 2016 13:34:45 +0000 (16:34 +0300)]
Fix doxygen warnings
Vladislav Sovrasov [Fri, 25 Mar 2016 13:17:58 +0000 (16:17 +0300)]
Add function setRNGSeed and seed setup in python tests
Alexander Alekhin [Fri, 25 Mar 2016 11:31:17 +0000 (11:31 +0000)]
Merge pull request #6313 from amannababanana:master
Maksim Shabunin [Fri, 25 Mar 2016 07:39:19 +0000 (07:39 +0000)]
Merge pull request #6322 from berak:fix_linux_eclipse_tutorial
Pavel Rojtberg [Thu, 24 Mar 2016 22:58:47 +0000 (23:58 +0100)]
highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings
Vladislav Sovrasov [Thu, 24 Mar 2016 17:05:26 +0000 (20:05 +0300)]
Replace of some synthetic scenes in python samples
berak [Thu, 24 Mar 2016 14:56:10 +0000 (15:56 +0100)]
fix changed libraries in eclipse tutorial
Maksim Shabunin [Thu, 24 Mar 2016 14:39:16 +0000 (17:39 +0300)]
Fixed cutom_hal.hpp file generation
Maksim Shabunin [Thu, 24 Mar 2016 14:05:54 +0000 (17:05 +0300)]
Using find_package to import custom HAL library
Vadim Pisarevsky [Wed, 23 Mar 2016 13:09:19 +0000 (13:09 +0000)]
Merge pull request #6243 from mshabunin:hal_morph
Vadim Pisarevsky [Wed, 23 Mar 2016 13:07:00 +0000 (13:07 +0000)]
Merge pull request #6285 from sovrasov:python_tests_cleanup
Lucas Solomon [Wed, 23 Mar 2016 05:31:16 +0000 (22:31 -0700)]
remove trailing whitespace
Lucas Solomon [Wed, 23 Mar 2016 02:03:28 +0000 (19:03 -0700)]
return 0 from VideoCapture::read() when cannot connect to camera
Peter Rekdal Sunde [Tue, 22 Mar 2016 12:26:55 +0000 (13:26 +0100)]
Add support for ffmpeg 3.0.
Maksim Shabunin [Mon, 21 Mar 2016 14:08:49 +0000 (14:08 +0000)]
Merge pull request #6286 from StevenPuttemans:add_num_features_info
Maksim Shabunin [Mon, 21 Mar 2016 14:01:17 +0000 (14:01 +0000)]
Merge pull request #6300 from berak:fix_akaze_sample
Maksim Shabunin [Mon, 21 Mar 2016 11:51:11 +0000 (11:51 +0000)]
Merge pull request #6214 from vonnieda:java_features2d
Alexander Alekhin [Mon, 21 Mar 2016 09:37:11 +0000 (09:37 +0000)]
Merge pull request #6267 from dtmoodie:issue_5918
Maksim Shabunin [Mon, 21 Mar 2016 09:20:51 +0000 (09:20 +0000)]
Merge pull request #6150 from lvv:fix-6149-applColorMap
Maksim Shabunin [Fri, 19 Feb 2016 10:49:13 +0000 (13:49 +0300)]
HAL interface for morphology operations
Leonid Volnitsky [Thu, 25 Feb 2016 10:23:49 +0000 (12:23 +0200)]
fix: 6149 (through CV_Error on wrong image type)
berak [Sat, 19 Mar 2016 08:55:18 +0000 (09:55 +0100)]
remove opencv_contrib dependancy from planar_tracking.cpp
Xiaolei Yu [Sun, 13 Mar 2016 09:08:25 +0000 (17:08 +0800)]
Make install paths relative to CMAKE_INSTALL_PREFIX
Alexander Alekhin [Fri, 18 Mar 2016 12:14:20 +0000 (12:14 +0000)]
Merge pull request #6290 from dtmoodie:thrust_allocator_usage_pr
Vladislav Sovrasov [Thu, 17 Mar 2016 12:33:28 +0000 (15:33 +0300)]
Add goodfeatures python test and cleanup in test directory
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.
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
Alexander Alekhin [Thu, 17 Mar 2016 11:08:12 +0000 (11:08 +0000)]
Merge pull request #6283 from jlubawy:vfw-surface4-fix
Josh Lubawy [Thu, 17 Mar 2016 08:00:49 +0000 (01:00 -0700)]
Remove cstdio debug
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
Alexander Alekhin [Wed, 16 Mar 2016 21:32:41 +0000 (21:32 +0000)]
Merge pull request #6273 from Bleach665:vs2010_mser_sampl
Bleach666 [Wed, 16 Mar 2016 14:51:20 +0000 (16:51 +0200)]
fix build detect_mser sample in vc2010
Alexander Alekhin [Wed, 16 Mar 2016 13:50:03 +0000 (13:50 +0000)]
Merge pull request #6270 from robbertkl:patch-2
Alexander Alekhin [Wed, 16 Mar 2016 13:49:32 +0000 (13:49 +0000)]
Merge pull request #6274 from Bleach665:cmake_policy_0020
Bleach666 [Wed, 16 Mar 2016 11:12:44 +0000 (13:12 +0200)]
suppress warning while generating solution in cmake
Robbert Klarenbeek [Tue, 15 Mar 2016 17:02:41 +0000 (18:02 +0100)]
Replace deprecated malloc.h
Alexander Alekhin [Wed, 16 Mar 2016 09:59:36 +0000 (09:59 +0000)]
Merge pull request #6268 from robbertkl:patch-1
Robbert Klarenbeek [Tue, 15 Mar 2016 16:21:05 +0000 (17:21 +0100)]
Fix incompatibility with some C++11 implementations
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
Dan [Thu, 10 Mar 2016 18:39:21 +0000 (13:39 -0500)]
Thrust allocator usage.
Dan [Thu, 10 Dec 2015 16:21:16 +0000 (11:21 -0500)]
Compatibility and bug fixes.
Dan [Wed, 9 Dec 2015 16:08:17 +0000 (11:08 -0500)]
Fixed more missing async calls.
Dan [Wed, 9 Dec 2015 16:05:07 +0000 (11:05 -0500)]
Implemented async calls.
Alexander Alekhin [Tue, 15 Mar 2016 12:51:20 +0000 (12:51 +0000)]
Merge pull request #6266 from gongzg:master
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>
Alexander Alekhin [Tue, 15 Mar 2016 07:51:24 +0000 (07:51 +0000)]
Merge pull request #6261 from dtmoodie:issue_6251
Dan [Mon, 14 Mar 2016 15:09:52 +0000 (11:09 -0400)]
Linux bug fix for ThrustAllocator.
Alexander Alekhin [Mon, 14 Mar 2016 14:46:21 +0000 (14:46 +0000)]
Merge pull request #6259 from polevoy-d-v:move_sematics_fix
Alexander Alekhin [Mon, 14 Mar 2016 14:46:06 +0000 (14:46 +0000)]
Merge pull request #6255 from delftswa2016:fix-5002
Прун Виктор [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.
Alexander Alekhin [Mon, 14 Mar 2016 11:27:55 +0000 (11:27 +0000)]
Merge pull request #6254 from berak:patch-2
Alexander Alekhin [Mon, 14 Mar 2016 11:27:11 +0000 (11:27 +0000)]
Merge pull request #6253 from berak:patch-1
Alexander Alekhin [Mon, 14 Mar 2016 11:26:51 +0000 (11:26 +0000)]
Merge pull request #6249 from sturkmen72:patch-15
Alexander Alekhin [Mon, 14 Mar 2016 11:25:22 +0000 (11:25 +0000)]
Merge pull request #6045 from matthieu-ft:master
renu285 [Mon, 14 Mar 2016 11:09:56 +0000 (12:09 +0100)]
Removed older libraries pointing to 2.4 in eclipse tutorial docs
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
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
Suleyman TURKMEN [Sun, 13 Mar 2016 19:11:34 +0000 (21:11 +0200)]
Update lda.cpp
typo correction
Vadim Pisarevsky [Sat, 12 Mar 2016 17:16:35 +0000 (17:16 +0000)]
Merge pull request #6096 from mnoskova:mn/SVMSGD_to_opencv3_0
Vadim Pisarevsky [Sat, 12 Mar 2016 17:11:19 +0000 (17:11 +0000)]
Merge pull request #6025 from sovrasov:new_python_tests
Vadim Pisarevsky [Sat, 12 Mar 2016 17:08:10 +0000 (17:08 +0000)]
Merge pull request #6119 from mshabunin:hal_filter2d
Vadim Pisarevsky [Sat, 12 Mar 2016 17:07:03 +0000 (17:07 +0000)]
Merge pull request #6137 from dtmoodie:thrust_allocator
Vadim Pisarevsky [Sat, 12 Mar 2016 16:40:35 +0000 (16:40 +0000)]
Merge pull request #6206 from alalek:polar_fix
Vadim Pisarevsky [Sat, 12 Mar 2016 16:38:39 +0000 (16:38 +0000)]
Merge pull request #6241 from cbalint13:agast