Alexander Alekhin [Thu, 21 Apr 2016 17:10:51 +0000 (20:10 +0300)]
Merge branch '2.4' into master
Commits:
67fe57a add fixed video
db0ae2c Restore 2.4 source branch for bug fix 6317.
97ac59c Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9 Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7 fix bug on border at pyrUp
Alexander Alekhin [Wed, 20 Apr 2016 14:21:19 +0000 (14:21 +0000)]
Merge pull request #6441 from asmorkalov:version++
Alexander Alekhin [Wed, 20 Apr 2016 13:26:12 +0000 (16:26 +0300)]
Merge branch '2.4.12.x-prep' into 2.4
Alexander Alekhin [Wed, 20 Apr 2016 13:24:25 +0000 (13:24 +0000)]
Merge pull request #6401 from StevenPuttemans:add_model_visualisation_tool_2.4
Alexander Smorkalov [Wed, 20 Apr 2016 13:03:47 +0000 (16:03 +0300)]
OpenCV version++.
Maksim Shabunin [Wed, 20 Apr 2016 11:55:03 +0000 (11:55 +0000)]
Merge pull request #6420 from ioxp:foreachDoc
Alexander Alekhin [Tue, 19 Apr 2016 16:06:35 +0000 (16:06 +0000)]
Merge pull request #6433 from schenker:master
Alexander Alekhin [Tue, 19 Apr 2016 14:19:41 +0000 (14:19 +0000)]
Merge pull request #6431 from StevenPuttemans:add_fixed_video_2.4
Alexander Alekhin [Tue, 19 Apr 2016 13:32:44 +0000 (13:32 +0000)]
Merge pull request #6432 from kevin-coder:bugfix_6317_Restore_2.4
StevenPuttemans [Tue, 19 Apr 2016 08:43:20 +0000 (10:43 +0200)]
add fixed video
Thomas Schenker [Tue, 19 Apr 2016 13:09:27 +0000 (15:09 +0200)]
fix typo
Kevin, Hu [Tue, 19 Apr 2016 11:27:42 +0000 (19:27 +0800)]
Restore 2.4 source branch for bug fix 6317.
Alexander Alekhin [Mon, 18 Apr 2016 15:14:21 +0000 (15:14 +0000)]
Merge pull request #6393 from paroj:v4l_exposure
Alexander Alekhin [Mon, 18 Apr 2016 15:13:14 +0000 (15:13 +0000)]
Merge pull request #5516 from AVshokurov:master
Alexander Alekhin [Mon, 18 Apr 2016 15:12:16 +0000 (15:12 +0000)]
Merge pull request #6421 from alalek:backport_6417
Alexander Alekhin [Mon, 18 Apr 2016 11:56:18 +0000 (11:56 +0000)]
Merge pull request #6397 from ioxp:androidCamLog
Suleyman TURKMEN [Sat, 16 Apr 2016 21:37:28 +0000 (00:37 +0300)]
fix for writing 16-bit jpeg2000
Philipp Hasper [Mon, 18 Apr 2016 11:51:07 +0000 (13:51 +0200)]
Fixing doc for cv::Mat::forEach
image.forEachWithPosition does not exist
Alexander Alekhin [Mon, 18 Apr 2016 11:43:14 +0000 (11:43 +0000)]
Merge pull request #6410 from alalek:issue_6403
Alexander Alekhin [Mon, 18 Apr 2016 10:35:28 +0000 (10:35 +0000)]
Merge pull request #6417 from sturkmen72:patch-14
Alexander Alekhin [Mon, 18 Apr 2016 10:34:42 +0000 (10:34 +0000)]
Merge pull request #6408 from dtmoodie:InputOutputArray_constructor_fix
Alexander Alekhin [Mon, 18 Apr 2016 10:29:29 +0000 (10:29 +0000)]
Merge pull request #6406 from ohnozzy:Bug-Fix-for-Issue-6377
Alexander Alekhin [Thu, 14 Apr 2016 14:20:57 +0000 (17:20 +0300)]
cmake: don't use -isystem for opencv_contrib paths
Maksim Shabunin [Sun, 17 Apr 2016 22:11:57 +0000 (22:11 +0000)]
Merge pull request #6414 from mshabunin:fix-macosx-warnings
Maksim Shabunin [Fri, 15 Apr 2016 18:48:39 +0000 (21:48 +0300)]
Updates for XCode 7.3
Alexander Alekhin [Sun, 17 Apr 2016 09:30:42 +0000 (09:30 +0000)]
Merge pull request #6359 from alalek:videocapture_exceptions
Suleyman TURKMEN [Sat, 16 Apr 2016 21:37:28 +0000 (00:37 +0300)]
fix for writing 16-bit jpeg2000
Maksim Shabunin [Sat, 16 Apr 2016 06:39:00 +0000 (06:39 +0000)]
Merge pull request #6415 from mshabunin:fix-xcode-warnings-24
Maksim Shabunin [Fri, 15 Apr 2016 18:56:50 +0000 (21:56 +0300)]
Updates for XCode 7.3
Dan [Thu, 14 Apr 2016 19:43:48 +0000 (15:43 -0400)]
templated std::vector<T> constructor was being called instead of const std::vector<cv::cuda::GpuMat>.
Alexander Alekhin [Thu, 14 Apr 2016 14:27:58 +0000 (14:27 +0000)]
Merge pull request #6404 from solosuper:bugfix/issue6315
Alexander Alekhin [Thu, 14 Apr 2016 14:27:27 +0000 (14:27 +0000)]
Merge pull request #6407 from StevenPuttemans:fix_ts_perf_warnings
Alexander Alekhin [Thu, 14 Apr 2016 14:27:12 +0000 (14:27 +0000)]
Merge pull request #6405 from StevenPuttemans:fix_gstreamer_cap_linux
StevenPuttemans [Thu, 14 Apr 2016 11:11:26 +0000 (13:11 +0200)]
fixing gstreamer cap
StevenPuttemans [Thu, 14 Apr 2016 11:48:11 +0000 (13:48 +0200)]
remove warnings generated during TS module tests
ohnozzy [Thu, 14 Apr 2016 11:35:57 +0000 (19:35 +0800)]
Bug Fix for 6377
Rewrite linearPolar & logPolar so that they do not depend on the
deprecated API CvMat. Issue 6377 is resolved in this way because the two
routines do not convert UMat to CvMat anymore.
solosuper [Thu, 14 Apr 2016 09:57:49 +0000 (11:57 +0200)]
fix #6315
StevenPuttemans [Thu, 14 Apr 2016 09:17:36 +0000 (11:17 +0200)]
add visualisation tool for 2.4 branch
Maksim Shabunin [Thu, 14 Apr 2016 08:42:39 +0000 (08:42 +0000)]
Merge pull request #6305 from rishirajsurti:master
rishirajsurti [Mon, 21 Mar 2016 02:53:04 +0000 (08:23 +0530)]
Thresholding Tutorial using inRange function on a video
Alexander Alekhin [Wed, 13 Apr 2016 13:38:53 +0000 (13:38 +0000)]
Merge pull request #6373 from terfendail:vt/stereobm_valgrind
Maksim Shabunin [Wed, 13 Apr 2016 11:34:58 +0000 (11:34 +0000)]
Merge pull request #6399 from mshabunin:fix-flann-memleak
Alexander Alekhin [Wed, 13 Apr 2016 10:05:40 +0000 (10:05 +0000)]
Merge pull request #6318 from paroj:gst_cap_props
Maksim Shabunin [Wed, 13 Apr 2016 10:05:25 +0000 (10:05 +0000)]
Merge pull request #6382 from StevenPuttemans:update_annotation_tool
Maksim Shabunin [Wed, 13 Apr 2016 10:02:56 +0000 (10:02 +0000)]
Merge pull request #6384 from StevenPuttemans:update_annotation_tool_2.4
Maksim Shabunin [Wed, 13 Apr 2016 09:08:42 +0000 (12:08 +0300)]
Fixed memory leak in flann KMeansIndex
StevenPuttemans [Mon, 11 Apr 2016 09:37:39 +0000 (11:37 +0200)]
vectorize process + enable early quitting/storage + enable delete annotion option
Maksim Shabunin [Wed, 13 Apr 2016 07:53:33 +0000 (07:53 +0000)]
Merge pull request #6395 from Tauranis:master
Maksim Shabunin [Wed, 13 Apr 2016 07:52:05 +0000 (07:52 +0000)]
Merge pull request #6335 from themightyoarfish:canny_kernel_sz_fix
Maksim Shabunin [Wed, 13 Apr 2016 07:51:33 +0000 (07:51 +0000)]
Merge pull request #6375 from ohnozzy:Bug-Fix-for-Issue-6288
Philipp Hasper [Wed, 13 Apr 2016 07:17:33 +0000 (09:17 +0200)]
Deactivated two noisy camera-retrieval log messages in android
They were issued for every frame retrieved - even in a release build.
StevenPuttemans [Mon, 11 Apr 2016 10:44:55 +0000 (12:44 +0200)]
vectorize process + enable early quitting/storage + enable delete annotation option
Tauranis [Tue, 12 Apr 2016 11:28:38 +0000 (08:28 -0300)]
Bug fix for MLP predict for small values to avoid nan responses.
Alexander Alekhin [Mon, 4 Apr 2016 11:09:04 +0000 (14:09 +0300)]
videoio: give chance for all enabled backends
"Eat" unexpected backend exceptions
Maksim Shabunin [Tue, 12 Apr 2016 15:55:55 +0000 (15:55 +0000)]
Merge pull request #6344 from anatolix:kalmanpyfix
Maksim Shabunin [Tue, 12 Apr 2016 15:23:43 +0000 (15:23 +0000)]
Merge pull request #6352 from fraserharris:patch-1
Maksim Shabunin [Tue, 12 Apr 2016 15:22:32 +0000 (15:22 +0000)]
Merge pull request #6345 from eduardohenriquearnold:master
Vitaly Tuzov [Tue, 12 Apr 2016 14:31:12 +0000 (17:31 +0300)]
Cost estimation boundaries description updated
Vitaly Tuzov [Tue, 12 Apr 2016 14:27:16 +0000 (17:27 +0300)]
Backport of StereoBM uninitialized memory access problem fix from master branch
ohnozzy [Sat, 9 Apr 2016 11:01:34 +0000 (19:01 +0800)]
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>
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
Pavel Rojtberg [Tue, 12 Apr 2016 10:10:54 +0000 (12:10 +0200)]
cap_v4l: allow manually controlling exposure
Maksim Shabunin [Tue, 12 Apr 2016 08:40:01 +0000 (08:40 +0000)]
Merge pull request #6383 from alalek:backport_6381
Maksim Shabunin [Tue, 12 Apr 2016 08:29:44 +0000 (08:29 +0000)]
Merge pull request #6386 from mshabunin:fix-python-test-issue
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
Maksim Shabunin [Mon, 11 Apr 2016 15:45:14 +0000 (18:45 +0300)]
Fixed problem with nonfree python test: could not find local test images
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.
Philipp Hasper [Mon, 11 Apr 2016 07:55:33 +0000 (09:55 +0200)]
operator<< handles keys starting with underscore
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
Vitaly Tuzov [Sat, 20 Feb 2016 10:29:34 +0000 (13:29 +0300)]
Fixed uninitialized memory errors in stereoBM
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 16:29:15 +0000 (16:29 +0000)]
Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24
Alexander Alekhin [Tue, 5 Apr 2016 15:25:15 +0000 (15:25 +0000)]
Merge pull request #6365 from terfendail:vt/nonlocal_testdata
Alexander Alekhin [Tue, 5 Apr 2016 15:23:55 +0000 (15:23 +0000)]
Merge pull request #6244 from dreifachstein:topic-cmake-install
Vitaly Tuzov [Tue, 5 Apr 2016 08:21:22 +0000 (11:21 +0300)]
Fix for nonlocal data requirement in test2.py
Alexander Alekhin [Tue, 5 Apr 2016 11:18:44 +0000 (14:18 +0300)]
ffmpeg: interrupt callback fix
backport from master
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
Fraser Harris [Fri, 1 Apr 2016 00:57:55 +0000 (17:57 -0700)]
Added description of the AR model
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
Anatoly Orlov [Tue, 29 Mar 2016 17:02:35 +0000 (20:02 +0300)]
small platform compatability fix for ESC key
projects / platform / upstream / opencv.git / log