platform/upstream/opencv.git
8 years agofindHomography sets output mask to all zeros in case of no inlier
Philipp Hasper [Thu, 18 Feb 2016 16:58:28 +0000 (17:58 +0100)]
findHomography sets output mask to all zeros in case of no inlier

8 years agoMerge pull request #6136 from mbarnach:6135-Fix-upperbody_xml_in_cuda
Alexander Alekhin [Thu, 18 Feb 2016 13:20:45 +0000 (13:20 +0000)]
Merge pull request #6136 from mbarnach:6135-Fix-upperbody_xml_in_cuda

8 years agoFix the missing - in file.
Mathieu Barnachon [Thu, 18 Feb 2016 10:28:41 +0000 (11:28 +0100)]
Fix the missing - in file.

8 years agoMerge pull request #6129 from mzajko:xi_new_param
Alexander Alekhin [Wed, 17 Feb 2016 15:47:59 +0000 (15:47 +0000)]
Merge pull request #6129 from mzajko:xi_new_param

8 years agoximea new param
Marian Zajko [Wed, 17 Feb 2016 10:18:49 +0000 (11:18 +0100)]
ximea new param

- added CAP_PROP_XI_SENSOR_BOARD_TEMP parameter
- added acquisition resetting for paramters that require it

8 years agoMerge pull request #6121 from mshabunin:fix-check-imencode-exif
Alexander Alekhin [Wed, 17 Feb 2016 00:45:49 +0000 (00:45 +0000)]
Merge pull request #6121 from mshabunin:fix-check-imencode-exif

8 years agoMerge pull request #6113 from rahulchhabra07:patch-1
Maksim Shabunin [Tue, 16 Feb 2016 09:04:38 +0000 (09:04 +0000)]
Merge pull request #6113 from rahulchhabra07:patch-1

8 years agoAdded filename emptyness check to the Exif reader, fixes 6120
Maksim Shabunin [Tue, 16 Feb 2016 08:37:27 +0000 (11:37 +0300)]
Added filename emptyness check to the Exif reader, fixes 6120

8 years agoMerge pull request #6060 from alalek:fix_opencl_opengl_sharing_6052
Alexander Alekhin [Tue, 16 Feb 2016 07:10:01 +0000 (07:10 +0000)]
Merge pull request #6060 from alalek:fix_opencl_opengl_sharing_6052

8 years agoMerge pull request #6090 from alalek:feature_6089
Maksim Shabunin [Mon, 15 Feb 2016 14:17:14 +0000 (14:17 +0000)]
Merge pull request #6090 from alalek:feature_6089

8 years agoMerge pull request #6103 from mshabunin:add-get-samples
Maksim Shabunin [Mon, 15 Feb 2016 13:11:28 +0000 (13:11 +0000)]
Merge pull request #6103 from mshabunin:add-get-samples

8 years agoMerge pull request #6105 from mshabunin:tutorial-folder-correction
Maksim Shabunin [Mon, 15 Feb 2016 13:10:44 +0000 (13:10 +0000)]
Merge pull request #6105 from mshabunin:tutorial-folder-correction

8 years agoMerge pull request #6104 from alalek:issue_6102
Maksim Shabunin [Mon, 15 Feb 2016 09:59:35 +0000 (09:59 +0000)]
Merge pull request #6104 from alalek:issue_6102

8 years agoMerge pull request #6100 from alalek:fix_5934
Alexander Alekhin [Mon, 15 Feb 2016 02:52:07 +0000 (02:52 +0000)]
Merge pull request #6100 from alalek:fix_5934

8 years agoUpdate imgproc.hpp
Rahul Chhabra [Sun, 14 Feb 2016 04:48:14 +0000 (10:18 +0530)]
Update imgproc.hpp

In reference to Issue #6110, the order of markerType and color is changed.

8 years agoTutorials: moved Megamind.avi files to samples/data folder
Maksim Shabunin [Fri, 12 Feb 2016 10:42:44 +0000 (13:42 +0300)]
Tutorials: moved Megamind.avi files to samples/data folder

8 years agoTutorials: moved imgcodecs and videoio tutorials to separate pages
Maksim Shabunin [Fri, 12 Feb 2016 10:35:46 +0000 (13:35 +0300)]
Tutorials: moved imgcodecs and videoio tutorials to separate pages

8 years agotest: initialize test data in test_umat.cpp (6102)
Alexander Alekhin [Fri, 12 Feb 2016 10:15:15 +0000 (13:15 +0300)]
test: initialize test data in test_umat.cpp (6102)

8 years agoml: moved getTestSamples implementation to src
Maksim Shabunin [Fri, 12 Feb 2016 09:32:26 +0000 (12:32 +0300)]
ml: moved getTestSamples implementation to src

8 years agoadd TestData::getTestSamples()
ahb [Sat, 5 Dec 2015 11:48:02 +0000 (12:48 +0100)]
add TestData::getTestSamples()

8 years agoMerge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility
Alexander Alekhin [Thu, 11 Feb 2016 15:00:52 +0000 (15:00 +0000)]
Merge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility

8 years agocmake: fix find_library() for bzip2
Alexander Alekhin [Thu, 11 Feb 2016 09:57:10 +0000 (12:57 +0300)]
cmake: fix find_library() for bzip2

8 years agoocl: fix OpenGL sharing detection (6052)
Alexander Alekhin [Thu, 4 Feb 2016 09:04:04 +0000 (12:04 +0300)]
ocl: fix OpenGL sharing detection (6052)

Apple OpenCL framework hasn't OpenGL sharing extension

8 years agoocl: OpenCL headers are located in "CL" subfolder (3rdparty/include)
Alexander Alekhin [Thu, 4 Feb 2016 08:55:00 +0000 (11:55 +0300)]
ocl: OpenCL headers are located in "CL" subfolder (3rdparty/include)

8 years agoMerge pull request #6051 from mshabunin:fix-cap-qtkit
Alexander Alekhin [Wed, 10 Feb 2016 17:35:20 +0000 (17:35 +0000)]
Merge pull request #6051 from mshabunin:fix-cap-qtkit

8 years agoMerge pull request #6042 from Dmitry-Me:reduceVariablesScope
Alexander Alekhin [Wed, 10 Feb 2016 17:33:43 +0000 (17:33 +0000)]
Merge pull request #6042 from Dmitry-Me:reduceVariablesScope

8 years agoMerge pull request #6073 from alalek:fix_5897
Alexander Alekhin [Wed, 10 Feb 2016 17:33:12 +0000 (17:33 +0000)]
Merge pull request #6073 from alalek:fix_5897

8 years agoMerge pull request #6032 from mzajko:ximea_getprop_update
Alexander Alekhin [Tue, 9 Feb 2016 12:07:16 +0000 (12:07 +0000)]
Merge pull request #6032 from mzajko:ximea_getprop_update

8 years agocmake: remove non-ascii symbols
Alexander Alekhin [Tue, 9 Feb 2016 11:44:05 +0000 (14:44 +0300)]
cmake: remove non-ascii symbols

8 years agocmake: add version control revision info for extra modules
Alexander Alekhin [Tue, 9 Feb 2016 11:36:42 +0000 (14:36 +0300)]
cmake: add version control revision info for extra modules

8 years agocmake: add timestamp into build info log (6089)
Alexander Alekhin [Tue, 9 Feb 2016 11:24:56 +0000 (14:24 +0300)]
cmake: add timestamp into build info log (6089)

8 years agoximea interface 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.

8 years agoMerge pull request #6088 from mshabunin:fix-exif-parsing
Alexander Alekhin [Mon, 8 Feb 2016 16:01:07 +0000 (16:01 +0000)]
Merge pull request #6088 from mshabunin:fix-exif-parsing

8 years agoMerge pull request #6082 from alekcac:alekcac-readme-changes
Alexander Alekhin [Mon, 8 Feb 2016 15:57:54 +0000 (15:57 +0000)]
Merge pull request #6082 from alekcac:alekcac-readme-changes

8 years agoMerge pull request #6085 from StevenPuttemans:add_at_matrix_info
Maksim Shabunin [Mon, 8 Feb 2016 15:30:17 +0000 (15:30 +0000)]
Merge pull request #6085 from StevenPuttemans:add_at_matrix_info

8 years agoExifReader::getFormat : check buffer length before accessing, fixes 6059
Maksim Shabunin [Mon, 8 Feb 2016 14:11:35 +0000 (17:11 +0300)]
ExifReader::getFormat : check buffer length before accessing, fixes 6059

8 years agoUpdate mat.hpp
Steven Puttemans [Mon, 8 Feb 2016 12:26:06 +0000 (13:26 +0100)]
Update mat.hpp

8 years agoAdded suggestions from PR6068
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

8 years agoRemoved gittip link
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

8 years agoMerge pull request #6075 from pranavg189:master
Alexander Alekhin [Sun, 7 Feb 2016 09:41:29 +0000 (09:41 +0000)]
Merge pull request #6075 from pranavg189:master

8 years agoremoved dirname variable
Pranav Ganorkar [Sat, 6 Feb 2016 21:39:21 +0000 (03:09 +0530)]
removed dirname variable

8 years agoffmpeg: compatibility guard for interrupt callback feature
Alexander Alekhin [Sat, 6 Feb 2016 12:20:36 +0000 (15:20 +0300)]
ffmpeg: compatibility guard for interrupt callback feature

8 years agocmake: skip checks for host paths on cross-compilation (5897)
Alexander Alekhin [Sat, 6 Feb 2016 12:19:28 +0000 (15:19 +0300)]
cmake: skip checks for host paths on cross-compilation (5897)

8 years agoMerge pull request #6068 from StevenPuttemans:add_at_matrix_info
Alexander Alekhin [Fri, 5 Feb 2016 14:03:22 +0000 (14:03 +0000)]
Merge pull request #6068 from StevenPuttemans:add_at_matrix_info

8 years agoMerge pull request #6067 from StevenPuttemans:adapt_cmake
Alexander Alekhin [Fri, 5 Feb 2016 12:51:00 +0000 (12:51 +0000)]
Merge pull request #6067 from StevenPuttemans:adapt_cmake

8 years agoadd clarification on the acces paramter of the at operator
StevenPuttemans [Fri, 5 Feb 2016 12:21:40 +0000 (13:21 +0100)]
add clarification on the acces paramter of the at operator

8 years agodeactivate build options by default that are not supposed the be ON by default
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

8 years agoMerge pull request #6053 from peters:master
Alexander Alekhin [Thu, 4 Feb 2016 19:33:20 +0000 (19:33 +0000)]
Merge pull request #6053 from peters:master

8 years agoAdd interrupt callback with default timeout of 30s. Fixes #5730.
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.

8 years agoMerge pull request #6058 from sturkmen72:documentation_fix_cv_repeate
Alexander Alekhin [Thu, 4 Feb 2016 15:14:02 +0000 (15:14 +0000)]
Merge pull request #6058 from sturkmen72:documentation_fix_cv_repeate

8 years agoMerge pull request #6062 from StevenPuttemans:fix_cascade_detect
Alexander Alekhin [Thu, 4 Feb 2016 14:04:52 +0000 (14:04 +0000)]
Merge pull request #6062 from StevenPuttemans:fix_cascade_detect

8 years agorevert PR 5362
StevenPuttemans [Thu, 4 Feb 2016 12:20:21 +0000 (13:20 +0100)]
revert PR 5362

8 years agoMerge pull request #6014 from alalek:fix_5991
Vadim Pisarevsky [Thu, 4 Feb 2016 09:54:27 +0000 (09:54 +0000)]
Merge pull request #6014 from alalek:fix_5991

8 years agoMerge pull request #6057 from alalek:fix_opencl_load_threadsafe
Vadim Pisarevsky [Thu, 4 Feb 2016 09:31:35 +0000 (09:31 +0000)]
Merge pull request #6057 from alalek:fix_opencl_load_threadsafe

8 years agoupdate documentation of cv::repeat
Suleyman TURKMEN [Wed, 3 Feb 2016 21:36:30 +0000 (23:36 +0200)]
update documentation of cv::repeat

8 years agoocl: thread-safe OpenCL loading (6056)
Alexander Alekhin [Wed, 3 Feb 2016 11:06:20 +0000 (14:06 +0300)]
ocl: thread-safe OpenCL loading (6056)

8 years agoMerge pull request #6009 from patricksnape:flann_python_fix
Alexander Alekhin [Tue, 2 Feb 2016 16:03:54 +0000 (16:03 +0000)]
Merge pull request #6009 from patricksnape:flann_python_fix

8 years agoMacOSX / QTKit capture: trying to fix invalid timer call
Maksim Shabunin [Tue, 2 Feb 2016 09:45:41 +0000 (12:45 +0300)]
MacOSX / QTKit capture: trying to fix invalid timer call

8 years agoMerge pull request #6048 from philippefoubert:ximea_bugfix
Alexander Alekhin [Tue, 2 Feb 2016 07:25:33 +0000 (07:25 +0000)]
Merge pull request #6048 from philippefoubert:ximea_bugfix

8 years agoMerge pull request #6036 from atinfinity:pullreq/160130-enable-nvcuvid
Alexander Alekhin [Tue, 2 Feb 2016 07:08:49 +0000 (07:08 +0000)]
Merge pull request #6036 from atinfinity:pullreq/160130-enable-nvcuvid

8 years agoBug correction:
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).

8 years agoadded cmakedefine to cmake/templates/cvconfig.h.in
atinfinity [Mon, 1 Feb 2016 11:59:11 +0000 (20:59 +0900)]
added cmakedefine to cmake/templates/cvconfig.h.in

8 years agoReduce variables scope
Dmitry-Me [Mon, 1 Feb 2016 08:10:13 +0000 (11:10 +0300)]
Reduce variables scope

8 years agofixed to use NVCUVID in 'cudacodec' module.
atinfinity [Sat, 30 Jan 2016 16:28:15 +0000 (01:28 +0900)]
fixed to use NVCUVID in 'cudacodec' module.

8 years agoMerge pull request #6035 from ogreen:master
Alexander Alekhin [Sat, 30 Jan 2016 08:22:59 +0000 (08:22 +0000)]
Merge pull request #6035 from ogreen:master

8 years agoCUDA median filtering using histograms
Oded Green [Sat, 30 Jan 2016 01:05:40 +0000 (20:05 -0500)]
CUDA median filtering using histograms

8 years agoMerge pull request #6012 from mzajko:xi_cmake_update
Alexander Alekhin [Fri, 29 Jan 2016 09:41:42 +0000 (09:41 +0000)]
Merge pull request #6012 from mzajko:xi_cmake_update

8 years agocore: preserve sizes values (fixes #5991)
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

8 years agotest: regression 5991
Alexander Alekhin [Tue, 26 Jan 2016 10:49:11 +0000 (13:49 +0300)]
test: regression 5991

8 years ago- removed whitespaces
Marian Zajko [Mon, 25 Jan 2016 12:13:13 +0000 (13:13 +0100)]
- removed whitespaces

8 years agoFixed ximea cmake settings
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.

8 years agoFix parsing of training vecs for FlannBasedMatcher
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.

8 years agoUpdate indentation to match rest of file
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.

8 years agoMerge pull request #6000 from alalek:fix_python_detection
Maksim Shabunin [Thu, 21 Jan 2016 11:30:58 +0000 (11:30 +0000)]
Merge pull request #6000 from alalek:fix_python_detection

8 years agoMerge pull request #5985 from Entodi:patch-1
Alexander Alekhin [Thu, 21 Jan 2016 10:02:55 +0000 (10:02 +0000)]
Merge pull request #5985 from Entodi:patch-1

8 years agoMerge pull request #5994 from alalek:fix_include_opencv
Alexander Alekhin [Thu, 21 Jan 2016 05:17:36 +0000 (05:17 +0000)]
Merge pull request #5994 from alalek:fix_include_opencv

8 years agoMerge pull request #5992 from ejoebstl:master
Alexander Alekhin [Wed, 20 Jan 2016 16:31:40 +0000 (16:31 +0000)]
Merge pull request #5992 from ejoebstl:master

8 years agocmake: fix python detection
Alexander Alekhin [Wed, 20 Jan 2016 16:01:00 +0000 (19:01 +0300)]
cmake: fix python detection

8 years agoRemoved trailing whitespace.
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.

8 years agoinclude available modules only
Alexander Alekhin [Wed, 20 Jan 2016 10:06:51 +0000 (13:06 +0300)]
include available modules only

8 years agoAdded a helpful comment on the scale parameter of the spherical
emiswelt [Tue, 19 Jan 2016 15:39:07 +0000 (15:39 +0000)]
Added a helpful comment on the scale parameter of the spherical
warper.

8 years agoMerge pull request #5983 from pra85:patch-1
Vadim Pisarevsky [Tue, 19 Jan 2016 10:51:21 +0000 (10:51 +0000)]
Merge pull request #5983 from pra85:patch-1

8 years agoFixed parser for img1_filename and img2_filename.
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

8 years agoMerge pull request #5971 from AlexeyAB:correct_lighting_3d_reconstruct
Alexander Alekhin [Mon, 18 Jan 2016 10:05:44 +0000 (10:05 +0000)]
Merge pull request #5971 from AlexeyAB:correct_lighting_3d_reconstruct

8 years agoMerge pull request #5981 from IshankGulati:feature_homography
Alexander Alekhin [Mon, 18 Jan 2016 10:05:14 +0000 (10:05 +0000)]
Merge pull request #5981 from IshankGulati:feature_homography

8 years agoUpdate license year range to 2016
Prayag Verma [Mon, 18 Jan 2016 04:41:01 +0000 (10:11 +0530)]
Update license year range to 2016

8 years agoMerge pull request #5884 from alalek:cmake_vars
Maksim Shabunin [Sun, 17 Jan 2016 09:43:17 +0000 (09:43 +0000)]
Merge pull request #5884 from alalek:cmake_vars

8 years agoadded equality
Ishank gulati [Sun, 17 Jan 2016 04:16:23 +0000 (09:46 +0530)]
added equality

8 years agoMerge pull request #5979 from alalek:world_disable_pch
Alexander Alekhin [Fri, 15 Jan 2016 17:28:48 +0000 (17:28 +0000)]
Merge pull request #5979 from alalek:world_disable_pch

8 years agoMerge pull request #5976 from alalek:fix_cmake_opencl
Alexander Alekhin [Fri, 15 Jan 2016 16:52:47 +0000 (16:52 +0000)]
Merge pull request #5976 from alalek:fix_cmake_opencl

8 years agocmake: turn off precompiled headers in case of opencv_world builds
Alexander Alekhin [Fri, 15 Jan 2016 16:43:24 +0000 (19:43 +0300)]
cmake: turn off precompiled headers in case of opencv_world builds

8 years agocmake: make ocv_cmake_dump_vars() case insensitive
Alexander Alekhin [Fri, 15 Jan 2016 11:38:25 +0000 (14:38 +0300)]
cmake: make ocv_cmake_dump_vars() case insensitive

8 years agocmake: add DEBUG_PRE/DEBUG_POST commands handling
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\")" .

8 years agocmake: added generation of CMakeVars.txt
Alexander Alekhin [Fri, 25 Dec 2015 14:35:38 +0000 (17:35 +0300)]
cmake: added generation of CMakeVars.txt

related: #5845

8 years agocmake: refactor OpenCL detection, allow custom configurations
Alexander Alekhin [Fri, 15 Jan 2016 09:42:22 +0000 (12:42 +0300)]
cmake: refactor OpenCL detection, allow custom configurations

8 years agoMerge pull request #5969 from alalek:fix_cuda_world
Alexander Alekhin [Fri, 15 Jan 2016 06:57:19 +0000 (06:57 +0000)]
Merge pull request #5969 from alalek:fix_cuda_world

8 years agoAdded ability to disable lighting in the viz-module.
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.

8 years agoMerge pull request #5922 from DarwinsBuddy:fix_no_py_load_svm_bug
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

8 years agoMerge pull request #5893 from dtmoodie:vtk
Alexander Alekhin [Thu, 14 Jan 2016 14:44:07 +0000 (14:44 +0000)]
Merge pull request #5893 from dtmoodie:vtk

8 years agobuild: fix opencv_world with CUDA
Alexander Alekhin [Thu, 14 Jan 2016 13:59:33 +0000 (16:59 +0300)]
build: fix opencv_world with CUDA