mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,627 Commits 6 Branches 126 Tags 3 GiB
d1a2c73228
Commit Graph

18627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry-Me
bf604f1780 Reduce variables scope 2016-02-01 11:10:13 +03: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
4894aac50d Merge pull request #6012 from mzajko:xi_cmake_update 2016-01-29 09:41:42 +00: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
Maksim Shabunin
1cd3c6f364 Merge pull request #6000 from alalek:fix_python_detection 2016-01-21 11:30:58 +00:00
Alexander Alekhin
c5531a7a2f Merge pull request #5985 from Entodi:patch-1 2016-01-21 10:02:55 +00:00
Alexander Alekhin
75b709328e Merge pull request #5994 from alalek:fix_include_opencv 2016-01-21 05:17:36 +00:00
Alexander Alekhin
5c8907c0e1 Merge pull request #5992 from ejoebstl:master 2016-01-20 16:31:41 +00:00
Alexander Alekhin
9bee835dac cmake: fix python detection 2016-01-20 19:01:00 +03: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
Alexander Alekhin
24bbdeb0c8 include available modules only 2016-01-20 13:07:46 +03:00
emiswelt
cc3b2f6197 Added a helpful comment on the scale parameter of the spherical 
warper.
 2016-01-19 15:39:07 +00:00
Vadim Pisarevsky
347ffbb0eb Merge pull request #5983 from pra85:patch-1 2016-01-19 10:51:21 +00:00
Alexander Fedorov
474c53ac71 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
 2016-01-18 15:34:41 +03:00
Alexander Alekhin
3f8d5be56f Merge pull request #5971 from AlexeyAB:correct_lighting_3d_reconstruct 2016-01-18 10:05:45 +00:00
Alexander Alekhin
8203b82f86 Merge pull request #5981 from IshankGulati:feature_homography 2016-01-18 10:05:14 +00:00
Prayag Verma
9a783d2a8e Update license year range to 2016 2016-01-18 10:11:01 +05:30
Maksim Shabunin
68eab8ea00 Merge pull request #5884 from alalek:cmake_vars 2016-01-17 09:43:17 +00:00
Ishank gulati
5312db93b4 added equality 2016-01-17 09:46:23 +05:30
Alexander Alekhin
64057965f5 Merge pull request #5979 from alalek:world_disable_pch 2016-01-15 17:28:48 +00:00
Alexander Alekhin
ec1e1c6fe9 Merge pull request #5976 from alalek:fix_cmake_opencl 2016-01-15 16:52:47 +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
8f37a3a37c cmake: make ocv_cmake_dump_vars() case insensitive 2016-01-15 14:38:25 +03:00
Alexander Alekhin
9cd6731894 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\")" .
 2016-01-15 14:36:03 +03:00
Alexander Alekhin
9d4ee2f54d cmake: added generation of CMakeVars.txt 
related: #5845
 2016-01-15 13:54:28 +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
bc46682b28 Merge pull request #5893 from dtmoodie:vtk 2016-01-14 14:44:07 +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
d6134a0089 Merge pull request #5962 from BinMatrix:patch-4 2016-01-14 12:08:06 +00:00
Alexander Alekhin
cda8e449ec Merge pull request #5954 from smidm:patch-1 2016-01-14 12:07:37 +00:00
Alexander Alekhin
7494fa33c6 Merge pull request #5923 from powderluv:master 2016-01-14 12:07:02 +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