shruthikashyap [Sat, 27 Feb 2016 22:16:52 +0000 (23:16 +0100)]
Fix for issue 6146
Alexander Alekhin [Thu, 11 Feb 2016 15:00:52 +0000 (15:00 +0000)]
Merge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility
Alexander Alekhin [Wed, 10 Feb 2016 17:35:20 +0000 (17:35 +0000)]
Merge pull request #6051 from mshabunin:fix-cap-qtkit
Alexander Alekhin [Wed, 10 Feb 2016 17:33:43 +0000 (17:33 +0000)]
Merge pull request #6042 from Dmitry-Me:reduceVariablesScope
Alexander Alekhin [Wed, 10 Feb 2016 17:33:12 +0000 (17:33 +0000)]
Merge pull request #6073 from alalek:fix_5897
Alexander Alekhin [Tue, 9 Feb 2016 12:07:16 +0000 (12:07 +0000)]
Merge pull request #6032 from mzajko:ximea_getprop_update
Marian Zajko [Fri, 29 Jan 2016 13:55:22 +0000 (14:55 +0100)]
ximea interface update
- fixed getProperty call definition
- added new parameter defitions
removed whitespaces
Reworked enumerators to keep values from previous commit
ximea enums fixes
- fixed whitespaces issue
- fixed duplicate enum values error
ximea enum definitions update
- fixed videioio.hpp code style
- fixed ABI violation in enums
- added new parameter handlers to cpp
XIMEA setProperty update
Added acquisition resetting to buffer size adjustment parameters.
Alexander Alekhin [Mon, 8 Feb 2016 16:01:07 +0000 (16:01 +0000)]
Merge pull request #6088 from mshabunin:fix-exif-parsing
Alexander Alekhin [Mon, 8 Feb 2016 15:57:54 +0000 (15:57 +0000)]
Merge pull request #6082 from alekcac:alekcac-readme-changes
Maksim Shabunin [Mon, 8 Feb 2016 15:30:17 +0000 (15:30 +0000)]
Merge pull request #6085 from StevenPuttemans:add_at_matrix_info
Maksim Shabunin [Mon, 8 Feb 2016 14:11:35 +0000 (17:11 +0300)]
ExifReader::getFormat : check buffer length before accessing, fixes 6059
Steven Puttemans [Mon, 8 Feb 2016 12:26:06 +0000 (13:26 +0100)]
Update mat.hpp
Steven Puttemans [Mon, 8 Feb 2016 09:20:08 +0000 (10:20 +0100)]
Added suggestions from PR6068
As discussed here: https://github.com/Itseez/opencv/pull/6068#issuecomment-
180797723
Alexander Shishkov [Mon, 8 Feb 2016 08:04:19 +0000 (11:04 +0300)]
Removed gittip link
This project is dead from 1st September last year
Alexander Alekhin [Sun, 7 Feb 2016 09:41:29 +0000 (09:41 +0000)]
Merge pull request #6075 from pranavg189:master
Pranav Ganorkar [Sat, 6 Feb 2016 21:39:21 +0000 (03:09 +0530)]
removed dirname variable
Alexander Alekhin [Sat, 6 Feb 2016 12:20:36 +0000 (15:20 +0300)]
ffmpeg: compatibility guard for interrupt callback feature
Alexander Alekhin [Sat, 6 Feb 2016 12:19:28 +0000 (15:19 +0300)]
cmake: skip checks for host paths on cross-compilation (5897)
Alexander Alekhin [Fri, 5 Feb 2016 14:03:22 +0000 (14:03 +0000)]
Merge pull request #6068 from StevenPuttemans:add_at_matrix_info
Alexander Alekhin [Fri, 5 Feb 2016 12:51:00 +0000 (12:51 +0000)]
Merge pull request #6067 from StevenPuttemans:adapt_cmake
StevenPuttemans [Fri, 5 Feb 2016 12:21:40 +0000 (13:21 +0100)]
add clarification on the acces paramter of the at operator
StevenPuttemans [Fri, 5 Feb 2016 10:01:21 +0000 (11:01 +0100)]
deactivate build options by default that are not supposed the be ON by default
Alexander Alekhin [Thu, 4 Feb 2016 19:33:20 +0000 (19:33 +0000)]
Merge pull request #6053 from peters:master
Peter Rekdal Sunde [Wed, 3 Feb 2016 00:00:43 +0000 (01:00 +0100)]
Add interrupt callback with default timeout of 30s. Fixes #5730.
Fix docs build failure by re-indenting with spaces instead of tabs.
Trailing whitespace fixes. http://pullrequest.opencv.org/buildbot/builders/precommit_docs/builds/5152/steps/whitespace/logs/stdio
mingw build fix.
Alexander Alekhin [Thu, 4 Feb 2016 15:14:02 +0000 (15:14 +0000)]
Merge pull request #6058 from sturkmen72:documentation_fix_cv_repeate
Alexander Alekhin [Thu, 4 Feb 2016 14:04:52 +0000 (14:04 +0000)]
Merge pull request #6062 from StevenPuttemans:fix_cascade_detect
StevenPuttemans [Thu, 4 Feb 2016 12:20:21 +0000 (13:20 +0100)]
revert PR 5362
Vadim Pisarevsky [Thu, 4 Feb 2016 09:54:27 +0000 (09:54 +0000)]
Merge pull request #6014 from alalek:fix_5991
Vadim Pisarevsky [Thu, 4 Feb 2016 09:31:35 +0000 (09:31 +0000)]
Merge pull request #6057 from alalek:fix_opencl_load_threadsafe
Suleyman TURKMEN [Wed, 3 Feb 2016 21:36:30 +0000 (23:36 +0200)]
update documentation of cv::repeat
Alexander Alekhin [Wed, 3 Feb 2016 11:06:20 +0000 (14:06 +0300)]
ocl: thread-safe OpenCL loading (6056)
Alexander Alekhin [Tue, 2 Feb 2016 16:03:54 +0000 (16:03 +0000)]
Merge pull request #6009 from patricksnape:flann_python_fix
Maksim Shabunin [Tue, 2 Feb 2016 09:45:41 +0000 (12:45 +0300)]
MacOSX / QTKit capture: trying to fix invalid timer call
Alexander Alekhin [Tue, 2 Feb 2016 07:25:33 +0000 (07:25 +0000)]
Merge pull request #6048 from philippefoubert:ximea_bugfix
Alexander Alekhin [Tue, 2 Feb 2016 07:08:49 +0000 (07:08 +0000)]
Merge pull request #6036 from atinfinity:pullreq/160130-enable-nvcuvid
Philippe FOUBERT [Mon, 1 Feb 2016 18:18:51 +0000 (19:18 +0100)]
Bug correction:
The "CvCaptureCAM_XIMEA::getProperty" method had not the same signature as "CvCapture::getProperty" so it was not called when we use the "VideoCapture::get" method (the "const" specifier was missing).
atinfinity [Mon, 1 Feb 2016 11:59:11 +0000 (20:59 +0900)]
added cmakedefine to cmake/templates/cvconfig.h.in
Dmitry-Me [Mon, 1 Feb 2016 08:10:13 +0000 (11:10 +0300)]
Reduce variables scope
atinfinity [Sat, 30 Jan 2016 16:28:15 +0000 (01:28 +0900)]
fixed to use NVCUVID in 'cudacodec' module.
Alexander Alekhin [Sat, 30 Jan 2016 08:22:59 +0000 (08:22 +0000)]
Merge pull request #6035 from ogreen:master
Oded Green [Sat, 30 Jan 2016 01:05:40 +0000 (20:05 -0500)]
CUDA median filtering using histograms
Alexander Alekhin [Fri, 29 Jan 2016 09:41:42 +0000 (09:41 +0000)]
Merge pull request #6012 from mzajko:xi_cmake_update
Alexander Alekhin [Tue, 26 Jan 2016 10:59:10 +0000 (13:59 +0300)]
core: preserve sizes values (fixes #5991)
_sizes can point to internal structure which is destroyed
by release() call
Alexander Alekhin [Tue, 26 Jan 2016 10:49:11 +0000 (13:49 +0300)]
test: regression 5991
Marian Zajko [Mon, 25 Jan 2016 12:13:13 +0000 (13:13 +0100)]
- removed whitespaces
Marian Zajko [Mon, 25 Jan 2016 10:05:55 +0000 (11:05 +0100)]
Fixed ximea cmake settings
Fixed ximea cmake settings for 32bit win build and linux.
Patrick Snape [Sat, 23 Jan 2016 15:58:16 +0000 (15:58 +0000)]
Fix parsing of training vecs for FlannBasedMatcher
FlannBasedMatcher::add is overloaded, but the style of parsing the
InputArrayOfArrays does not match the style from
DescriptorMatcher::add. The issue is that InputArrayOfArrays
must be properly marshalled so that the data can be read
correctly. In this case, the method expects the training
descriptors to be either a vector of matrices or a single matrix
(as is shown in DescriptorMatcher::add). These code
replicates that for the case of the FlannBasedMatcher::add.
In fact, a similar commit to this was added by 26d9a7c but was
ultimately not accepted in #4111. This is likely due to the
fact that the input arrays were not parsed properly and the
case of a single matrix was being improperly handled. I believe
this commit to be correct given the logic from
DescriptorMatcher::add.
Patrick Snape [Sat, 23 Jan 2016 15:57:46 +0000 (15:57 +0000)]
Update indentation to match rest of file
Very cosmetic, but was analyzing code and just wanted to make it
consistent.
Maksim Shabunin [Thu, 21 Jan 2016 11:30:58 +0000 (11:30 +0000)]
Merge pull request #6000 from alalek:fix_python_detection
Alexander Alekhin [Thu, 21 Jan 2016 10:02:55 +0000 (10:02 +0000)]
Merge pull request #5985 from Entodi:patch-1
Alexander Alekhin [Thu, 21 Jan 2016 05:17:36 +0000 (05:17 +0000)]
Merge pull request #5994 from alalek:fix_include_opencv
Alexander Alekhin [Wed, 20 Jan 2016 16:31:40 +0000 (16:31 +0000)]
Merge pull request #5992 from ejoebstl:master
Alexander Alekhin [Wed, 20 Jan 2016 16:01:00 +0000 (19:01 +0300)]
cmake: fix python detection
emiswelt [Wed, 20 Jan 2016 10:21:36 +0000 (10:21 +0000)]
Removed trailing whitespace.
Note: Force push to force a re-run of build tests. The previous tests
failed in an unrelated module. I assume it's a bug that occured
randomly.
Alexander Alekhin [Wed, 20 Jan 2016 10:06:51 +0000 (13:06 +0300)]
include available modules only
emiswelt [Tue, 19 Jan 2016 15:39:07 +0000 (15:39 +0000)]
Added a helpful comment on the scale parameter of the spherical
warper.
Vadim Pisarevsky [Tue, 19 Jan 2016 10:51:21 +0000 (10:51 +0000)]
Merge pull request #5983 from pra85:patch-1
Alexander Fedorov [Mon, 18 Jan 2016 12:34:41 +0000 (15:34 +0300)]
Fixed parser for img1_filename and img2_filename.
Without fixes after 68 line (img1_filename = parser.get<std::string>(0);) OpenCV Error:
./stereo_matching im0.png im1.png --max-disparity=16 --blocksize=17
OpenCV Error: Bad argument (undeclared position 0 requested) in getByIndex, file /home/entodi/opencv/modules/core/src/command_line_parser.cpp, line 169
terminate called after throwing an instance of 'cv::Exception'
what(): /home/entodi/opencv/modules/core/src/command_line_parser.cpp:169: error: (-5) undeclared position 0 requested in function getByIndex
Alexander Alekhin [Mon, 18 Jan 2016 10:05:44 +0000 (10:05 +0000)]
Merge pull request #5971 from AlexeyAB:correct_lighting_3d_reconstruct
Alexander Alekhin [Mon, 18 Jan 2016 10:05:14 +0000 (10:05 +0000)]
Merge pull request #5981 from IshankGulati:feature_homography
Prayag Verma [Mon, 18 Jan 2016 04:41:01 +0000 (10:11 +0530)]
Update license year range to 2016
Maksim Shabunin [Sun, 17 Jan 2016 09:43:17 +0000 (09:43 +0000)]
Merge pull request #5884 from alalek:cmake_vars
Ishank gulati [Sun, 17 Jan 2016 04:16:23 +0000 (09:46 +0530)]
added equality
Alexander Alekhin [Fri, 15 Jan 2016 17:28:48 +0000 (17:28 +0000)]
Merge pull request #5979 from alalek:world_disable_pch
Alexander Alekhin [Fri, 15 Jan 2016 16:52:47 +0000 (16:52 +0000)]
Merge pull request #5976 from alalek:fix_cmake_opencl
Alexander Alekhin [Fri, 15 Jan 2016 16:43:24 +0000 (19:43 +0300)]
cmake: turn off precompiled headers in case of opencv_world builds
Alexander Alekhin [Fri, 15 Jan 2016 11:38:25 +0000 (14:38 +0300)]
cmake: make ocv_cmake_dump_vars() case insensitive
Alexander Alekhin [Fri, 15 Jan 2016 11:03:48 +0000 (14:03 +0300)]
cmake: add DEBUG_PRE/DEBUG_POST commands handling
Useful for debug purposes:
cmake -DDEBUG_POST="ocv_cmake_dump_vars(CUDA)" .
cmake -DCMAKE_PRE="ocv_cmake_dump_vars(\"OPENCL|opencl\")" .
Alexander Alekhin [Fri, 25 Dec 2015 14:35:38 +0000 (17:35 +0300)]
cmake: added generation of CMakeVars.txt
related: #5845
Alexander Alekhin [Fri, 15 Jan 2016 09:42:22 +0000 (12:42 +0300)]
cmake: refactor OpenCL detection, allow custom configurations
Alexander Alekhin [Fri, 15 Jan 2016 06:57:19 +0000 (06:57 +0000)]
Merge pull request #5969 from alalek:fix_cuda_world
AlexeyAB [Thu, 14 Jan 2016 16:02:18 +0000 (19:02 +0300)]
Added ability to disable lighting in the viz-module.
When I reconstructed the 3D scene I want to show it as viz::WMesh with an initial value of lighting. For this I disable lighting and shadows:
cv::viz::Viz3d viz_3d_window("3D");
viz_3d_window.setRenderingProperty("mesh", cv::viz::LIGHTING, 0);
Most of the examples show the 3D reconstruction using the point cloud, but using the mesh one part of it creates a shadow on other parts of it if lighting ON.
Using a 3D mesh with disabled lighting gives the most realistic picture of the reconstructed 3D scene.
Alexander Alekhin [Thu, 14 Jan 2016 14:44:27 +0000 (14:44 +0000)]
Merge pull request #5922 from DarwinsBuddy:fix_no_py_load_svm_bug
Alexander Alekhin [Thu, 14 Jan 2016 14:44:07 +0000 (14:44 +0000)]
Merge pull request #5893 from dtmoodie:vtk
Alexander Alekhin [Thu, 14 Jan 2016 13:59:33 +0000 (16:59 +0300)]
build: fix opencv_world with CUDA
Alexander Alekhin [Thu, 14 Jan 2016 13:18:38 +0000 (13:18 +0000)]
Merge pull request #5968 from alalek:fix_5967
Alexander Alekhin [Thu, 14 Jan 2016 12:09:25 +0000 (12:09 +0000)]
Merge pull request #5965 from amroamroamro:fix_concentric_spheres
Alexander Alekhin [Thu, 14 Jan 2016 12:08:53 +0000 (12:08 +0000)]
Merge pull request #5964 from amroamroamro:fix_lr
Alexander Alekhin [Thu, 14 Jan 2016 12:08:28 +0000 (12:08 +0000)]
Merge pull request #5963 from KeySecure:master
Alexander Alekhin [Thu, 14 Jan 2016 12:08:06 +0000 (12:08 +0000)]
Merge pull request #5962 from BinMatrix:patch-4
Alexander Alekhin [Thu, 14 Jan 2016 12:07:37 +0000 (12:07 +0000)]
Merge pull request #5954 from smidm:patch-1
Alexander Alekhin [Thu, 14 Jan 2016 12:07:01 +0000 (12:07 +0000)]
Merge pull request #5923 from powderluv:master
Alexander Alekhin [Thu, 14 Jan 2016 11:38:37 +0000 (14:38 +0300)]
fix TLS implementation (closes #5967)
Amro [Thu, 14 Jan 2016 00:56:34 +0000 (02:56 +0200)]
fix assignment of class labels
by using the indices from the sorted distance vector of pairs.
Amro [Wed, 13 Jan 2016 17:44:47 +0000 (19:44 +0200)]
clean up code for train and predict methods of LR
Amro [Wed, 13 Jan 2016 17:38:49 +0000 (19:38 +0200)]
fix LR predict with raw output in 2-class case
In case of binary class, pred_m is initialized as zero vector and later
returned when raw outputs are requested, but it is never filled.
Alexander Alekhin [Wed, 13 Jan 2016 17:31:32 +0000 (17:31 +0000)]
Merge pull request #5952 from alalek:ffmpeg_alloc_buffer
KeySecure [Wed, 13 Jan 2016 12:19:19 +0000 (20:19 +0800)]
make Xcode 7.2 happy.
BinMatrix [Wed, 13 Jan 2016 11:04:17 +0000 (19:04 +0800)]
Fix the mouse bug and the problem of collapse
Alexander Alekhin [Tue, 12 Jan 2016 17:58:07 +0000 (17:58 +0000)]
Merge pull request #5949 from akarsakov:fixed_solvePnPRansac_input_handling
Alexander Alekhin [Tue, 12 Jan 2016 17:15:15 +0000 (17:15 +0000)]
Merge pull request #5943 from alalek:regression_5908
Matěj Šmíd [Tue, 12 Jan 2016 15:33:34 +0000 (16:33 +0100)]
fisheye documentation typo
Alexander Alekhin [Tue, 12 Jan 2016 14:51:26 +0000 (17:51 +0300)]
videoio ffmpeg: fix buffer allocation for unaligned frame sizes
Alexander Karsakov [Tue, 12 Jan 2016 09:14:19 +0000 (12:14 +0300)]
Fixed getSubset method to support Nx3 1-channel matrices as input (3xN 1-channel matrices doesn't supported at all).
Alexander Karsakov [Tue, 12 Jan 2016 09:13:28 +0000 (12:13 +0300)]
Added test for checking that solvePnPRansac accepts vector<Point3f> and Nx3 1-channel or 1xN/Nx1 3-channel matrices as input.
Alexander Alekhin [Tue, 12 Jan 2016 08:09:20 +0000 (08:09 +0000)]
Merge pull request #5947 from takacsd:patch-2
Alexander Alekhin [Mon, 11 Jan 2016 12:38:38 +0000 (15:38 +0300)]
test: added regression test for convexityDefects (#5908)
takacsd [Mon, 11 Jan 2016 15:11:50 +0000 (16:11 +0100)]
Add missing implementation to one of the Mat_<_Tp> constructor. (#5945)
Alexander Alekhin [Mon, 11 Jan 2016 13:00:17 +0000 (13:00 +0000)]
Merge pull request #5914 from LaurentBerger:I5908
Alexander Alekhin [Mon, 11 Jan 2016 12:36:52 +0000 (15:36 +0300)]
ts: move PARAM_TEST_CASE and GET_PARAM into ts.hpp