Vadim Pisarevsky
56c89e0a98
Merge pull request #6014 from alalek:fix_5991
2016-02-04 09:54:27 +00:00
Alexander Alekhin
7e472fbf68
ocl: thread-safe OpenCL loading (6056)
2016-02-03 18:30:40 +03:00
Alexander Alekhin
6f51dd1258
Merge pull request #6009 from patricksnape:flann_python_fix
2016-02-02 16:03:54 +00:00
Alexander Alekhin
35014a9742
Merge pull request #6048 from philippefoubert:ximea_bugfix
2016-02-02 07:25:34 +00:00
Philippe FOUBERT
43a1874e33
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).
2016-02-01 19:19:52 +01:00
atinfinity
ed8368fed7
fixed to use NVCUVID in 'cudacodec' module.
2016-01-31 01:28:15 +09:00
Alexander Alekhin
a4692a0da5
Merge pull request #6035 from ogreen:master
2016-01-30 08:23:00 +00:00
Oded Green
1a0282df21
CUDA median filtering using histograms
2016-01-29 20:05:40 -05:00
Alexander Alekhin
2978a16c85
core: preserve sizes values ( fixes #5991 )
...
_sizes can point to internal structure which is destroyed
by release() call
2016-01-26 14:11:53 +03:00
Alexander Alekhin
96f5a930f4
test: regression 5991
2016-01-26 14:11:53 +03:00
Marian Zajko
a387d6fa26
- removed whitespaces
2016-01-25 13:13:13 +01:00
Marian Zajko
34c006fcc4
Fixed ximea cmake settings
...
Fixed ximea cmake settings for 32bit win build and linux.
2016-01-25 11:05:55 +01:00
Patrick Snape
05cfe28612
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.
2016-01-23 15:58:16 +00:00
Patrick Snape
2f5ea3437e
Update indentation to match rest of file
...
Very cosmetic, but was analyzing code and just wanted to make it
consistent.
2016-01-23 15:57:46 +00:00
emiswelt
b6c5936704
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.
2016-01-20 12:04:42 +00:00
emiswelt
cc3b2f6197
Added a helpful comment on the scale parameter of the spherical
...
warper.
2016-01-19 15:39:07 +00:00
Alexander Alekhin
3f8d5be56f
Merge pull request #5971 from AlexeyAB:correct_lighting_3d_reconstruct
2016-01-18 10:05:45 +00:00
Alexander Alekhin
64057965f5
Merge pull request #5979 from alalek:world_disable_pch
2016-01-15 17:28:48 +00:00
Alexander Alekhin
c75f9c80c7
cmake: turn off precompiled headers in case of opencv_world builds
2016-01-15 19:43:24 +03:00
Alexander Alekhin
c35ddcba1a
cmake: refactor OpenCL detection, allow custom configurations
2016-01-15 13:05:16 +03:00
Alexander Alekhin
243c513eea
Merge pull request #5969 from alalek:fix_cuda_world
2016-01-15 06:57:19 +00:00
AlexeyAB
fcbb57a63f
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.
2016-01-14 19:02:18 +03:00
Alexander Alekhin
df89e76fb1
Merge pull request #5922 from DarwinsBuddy:fix_no_py_load_svm_bug
2016-01-14 14:44:27 +00:00
Alexander Alekhin
c8ff7a4867
build: fix opencv_world with CUDA
2016-01-14 17:23:55 +03:00
Alexander Alekhin
c3ad8af42a
Merge pull request #5968 from alalek:fix_5967
2016-01-14 13:18:38 +00:00
Alexander Alekhin
cb0b2bd1af
Merge pull request #5965 from amroamroamro:fix_concentric_spheres
2016-01-14 12:09:25 +00:00
Alexander Alekhin
a1d7e38adb
Merge pull request #5964 from amroamroamro:fix_lr
2016-01-14 12:08:53 +00:00
Alexander Alekhin
0655a2dc20
Merge pull request #5963 from KeySecure:master
2016-01-14 12:08:28 +00:00
Alexander Alekhin
cda8e449ec
Merge pull request #5954 from smidm:patch-1
2016-01-14 12:07:37 +00:00
Alexander Alekhin
c7ccde69a8
fix TLS implementation ( closes #5967 )
2016-01-14 14:38:37 +03:00
Amro
47cdb041f2
fix assignment of class labels
...
by using the indices from the sorted distance vector of pairs.
2016-01-14 02:56:34 +02:00
Amro
542f2b2e3c
clean up code for train and predict methods of LR
2016-01-13 20:47:07 +02:00
Amro
e67178c696
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.
2016-01-13 19:48:21 +02:00
Alexander Alekhin
3d2fc6c2fd
Merge pull request #5952 from alalek:ffmpeg_alloc_buffer
2016-01-13 17:31:32 +00:00
KeySecure
e6ac2ca3c9
make Xcode 7.2 happy.
2016-01-13 20:19:19 +08:00
Alexander Alekhin
e3690db4bd
Merge pull request #5949 from akarsakov:fixed_solvePnPRansac_input_handling
2016-01-12 17:58:07 +00:00
Alexander Alekhin
5a998335a6
Merge pull request #5943 from alalek:regression_5908
2016-01-12 17:15:15 +00:00
Matěj Šmíd
3e176bbfa0
fisheye documentation typo
2016-01-12 16:33:34 +01:00
Alexander Alekhin
285eb0a539
videoio ffmpeg: fix buffer allocation for unaligned frame sizes
2016-01-12 17:57:43 +03:00
Alexander Karsakov
e784ea7178
Fixed getSubset method to support Nx3 1-channel matrices as input (3xN 1-channel matrices doesn't supported at all).
2016-01-12 13:26:17 +03:00
Alexander Karsakov
0c9c7d5f3b
Added test for checking that solvePnPRansac accepts vector<Point3f> and Nx3 1-channel or 1xN/Nx1 3-channel matrices as input.
2016-01-12 12:13:28 +03:00
Alexander Alekhin
49d3e39bc4
test: added regression test for convexityDefects ( #5908 )
2016-01-11 19:47:36 +03:00
takacsd
1e0928633d
Add missing implementation to one of the Mat_<_Tp> constructor. ( #5945 )
2016-01-11 16:11:50 +01:00
Alexander Alekhin
7a62a8213b
Merge pull request #5914 from LaurentBerger:I5908
2016-01-11 13:00:17 +00:00
Alexander Alekhin
43033f0b1d
ts: move PARAM_TEST_CASE and GET_PARAM into ts.hpp
2016-01-11 15:36:52 +03:00
Alexander Alekhin
ec466ed1e0
Merge pull request #5936 from ejoebstl:master
2016-01-11 11:13:06 +00:00
Alexander Alekhin
a8b27ae303
Merge pull request #5910 from rokm:cuda-warnings
2016-01-11 11:11:27 +00:00
Christoph Spörk
3f172731b2
added wrapped load function for python as suggested by gat3way
2016-01-11 10:59:15 +01:00
Emanuel Jöbstl
4e469f2866
Changed parameter order in documentation
...
Changed parameter order in documentation of findEssentialMat, because threshold and probability were switched.
2016-01-08 14:46:17 +00:00
Christoph Spörk
66eda72f66
fixed a doxygen issue
2016-01-07 08:19:06 +01:00