4894aac50d
Merge pull request #6012 from mzajko:xi_cmake_update
9 years ago
2978a16c85
core: preserve sizes values ( fixes #5991 )
...
_sizes can point to internal structure which is destroyed
by release() call
9 years ago
96f5a930f4
test: regression 5991
9 years ago
a387d6fa26
- removed whitespaces
9 years ago
34c006fcc4
Fixed ximea cmake settings
...
Fixed ximea cmake settings for 32bit win build and linux.
9 years ago
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#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.
9 years ago
2f5ea3437e
Update indentation to match rest of file
...
Very cosmetic, but was analyzing code and just wanted to make it
consistent.
9 years ago
c35b00a97e
fix code snippet showing how to use SparseMat
...
generate indices within the size limit (modulo)
9 years ago
e835878661
Merge pull request #6006 from mleotta:fix-install-name-dir
9 years ago
912592de4c
Remove "INSTALL_NAME_DIR lib" target property
...
The INSTALL_NAME_DIR property of a target specifies how a dynamic library should
be found on OS X. If INSTALL_NAME_DIR is not specified the loader will search
relative to the standard search paths. If specified it should either be
an absolute path or relative path prefixed with either @executable_path ,
@load_path , or @rpath . Specifying "lib" does not make sense here and
causes linking error as documented here:
http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library-on-mac-osx/
and here
http://stackoverflow.com/questions/26978806/dyld-library-not-loaded-lib-libopencv-core-3-0-dylib-reason-image-not-found
This patch removes INSTALL_NAME_DIR everywhere it is set to "lib".
An alternate solution would be to set an absolute path like
"${CMAKE_INSTALL_PREFIX}/lib" or relative path like
"@executable_path/../lib". However, if there is not specific need for
specifying a path, it is probably best left unset.
9 years ago
85793d0138
Merge pull request #6001 from terfendail:pyrsegmentation_valgrind
9 years ago
a57b03c356
Merge pull request #5993 from asmorkalov:linitian_signed_packages
9 years ago
5a5378b3bf
Added lintian overrides for package signature entry.
9 years ago
1cd3c6f364
Merge pull request #6000 from alalek:fix_python_detection
9 years ago
c5531a7a2f
Merge pull request #5985 from Entodi:patch-1
9 years ago
f01f1bc5e6
Fixed "Conditional jump or move depends on uninitialised value(s)" valgrind issue due to wrong pointer recalculation for zero level of pyramid.
9 years ago
75b709328e
Merge pull request #5994 from alalek:fix_include_opencv
9 years ago
85c7190e41
Merge pull request #5995 from alalek:fix_include_opencv_24
9 years ago
5c8907c0e1
Merge pull request #5992 from ejoebstl:master
9 years ago
9bee835dac
cmake: fix python detection
9 years ago
f2e4bec925
Merge pull request #5996 from ElenaGvozdeva:pyrUp_fix
9 years ago
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.
9 years ago
4a8d1147c2
include available modules only
9 years ago
24bbdeb0c8
include available modules only
9 years ago
bb1c2d71a8
fix bug on border at pyrUp
9 years ago
cc3b2f6197
Added a helpful comment on the scale parameter of the spherical
...
warper.
9 years ago
347ffbb0eb
Merge pull request #5983 from pra85:patch-1
9 years ago
be565c2235
Merge pull request #5984 from terfendail:2.4
9 years ago
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
9 years ago
3f8d5be56f
Merge pull request #5971 from AlexeyAB:correct_lighting_3d_reconstruct
9 years ago
8203b82f86
Merge pull request #5981 from IshankGulati:feature_homography
9 years ago
389f176a67
Removed ioctl calls to query for VIDIOC_G_INPUT and VIDIOC_ENUMINPUT since information returned by the calls is never used.
...
Fixed icvCaptureFromCAM_V4L return value in case of V4L2 camera initialization failure.
9 years ago
9a783d2a8e
Update license year range to 2016
9 years ago
68eab8ea00
Merge pull request #5884 from alalek:cmake_vars
9 years ago
5312db93b4
added equality
9 years ago
64057965f5
Merge pull request #5979 from alalek:world_disable_pch
9 years ago
ec1e1c6fe9
Merge pull request #5976 from alalek:fix_cmake_opencl
9 years ago
c75f9c80c7
cmake: turn off precompiled headers in case of opencv_world builds
9 years ago
5c21ca2697
Merge pull request #5975 from terfendail:2.4
9 years ago
8f37a3a37c
cmake: make ocv_cmake_dump_vars() case insensitive
9 years ago
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\")" .
9 years ago
9d4ee2f54d
cmake: added generation of CMakeVars.txt
...
related: #5845
9 years ago
c35ddcba1a
cmake: refactor OpenCL detection, allow custom configurations
9 years ago
4f5d585184
Update call to Tegra optimized morphology filtering
9 years ago
243c513eea
Merge pull request #5969 from alalek:fix_cuda_world
9 years ago
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.
9 years ago
df89e76fb1
Merge pull request #5922 from DarwinsBuddy:fix_no_py_load_svm_bug
9 years ago
bc46682b28
Merge pull request #5893 from dtmoodie:vtk
9 years ago
c8ff7a4867
build: fix opencv_world with CUDA
9 years ago
c3ad8af42a
Merge pull request #5968 from alalek:fix_5967
9 years ago
Alexander Alekhin
Marian Zajko
Patrick Snape
Amro
Matt Leotta
Alexander Smorkalov
Maksim Shabunin
Vitaly Tuzov
emiswelt
Elena Gvozdeva
Vadim Pisarevsky
Alexander Fedorov
Prayag Verma
Ishank gulati
AlexeyAB