Merge pull request #6000 from alalek:fix_python_detection
Merge pull request #5985 from Entodi:patch-1
Merge pull request #5994 from alalek:fix_include_opencv
Merge pull request #5992 from ejoebstl:master
cmake: fix python detection
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.
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.
include available modules only
Added a helpful comment on the scale parameter of the spherical
warper.
warper.
Merge pull request #5983 from pra85:patch-1
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
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
Merge pull request #5971 from AlexeyAB:correct_lighting_3d_reconstruct
Merge pull request #5981 from IshankGulati:feature_homography
Update license year range to 2016
Merge pull request #5884 from alalek:cmake_vars
added equality
Merge pull request #5979 from alalek:world_disable_pch
Merge pull request #5976 from alalek:fix_cmake_opencl
cmake: turn off precompiled headers in case of opencv_world builds
cmake: make ocv_cmake_dump_vars() case insensitive
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\")" .
Useful for debug purposes:
cmake -DDEBUG_POST="ocv_cmake_dump_vars(CUDA)" .
cmake -DCMAKE_PRE="ocv_cmake_dump_vars(\"OPENCL|opencl\")" .
cmake: added generation of CMakeVars.txt
related: #5845
related: #5845
cmake: refactor OpenCL detection, allow custom configurations
Merge pull request #5969 from alalek:fix_cuda_world
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.
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.
Merge pull request #5922 from DarwinsBuddy:fix_no_py_load_svm_bug
Merge pull request #5893 from dtmoodie:vtk
build: fix opencv_world with CUDA
Merge pull request #5968 from alalek:fix_5967
Merge pull request #5965 from amroamroamro:fix_concentric_spheres
Merge pull request #5964 from amroamroamro:fix_lr
Merge pull request #5963 from KeySecure:master
Merge pull request #5962 from BinMatrix:patch-4
Merge pull request #5954 from smidm:patch-1
Merge pull request #5923 from powderluv:master
fix TLS implementation (closes #5967)
fix assignment of class labels
by using the indices from the sorted distance vector of pairs.
by using the indices from the sorted distance vector of pairs.
clean up code for train and predict methods of LR
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.
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.
Merge pull request #5952 from alalek:ffmpeg_alloc_buffer
make Xcode 7.2 happy.
Fix the mouse bug and the problem of collapse
Merge pull request #5949 from akarsakov:fixed_solvePnPRansac_input_handling
Merge pull request #5943 from alalek:regression_5908
fisheye documentation typo
videoio ffmpeg: fix buffer allocation for unaligned frame sizes
Fixed getSubset method to support Nx3 1-channel matrices as input (3xN 1-channel matrices doesn't supported at all).
Added test for checking that solvePnPRansac accepts vector<Point3f> and Nx3 1-channel or 1xN/Nx1 3-channel matrices as input.
Merge pull request #5947 from takacsd:patch-2
test: added regression test for convexityDefects (#5908)
Add missing implementation to one of the Mat_<_Tp> constructor. (#5945)
Merge pull request #5914 from LaurentBerger:I5908
ts: move PARAM_TEST_CASE and GET_PARAM into ts.hpp
Merge pull request #5936 from ejoebstl:master
Merge pull request #5924 from Photonomie:release/3.1.0-patched
Merge pull request #5910 from rokm:cuda-warnings
added wrapped load function for python as suggested by gat3way
Changed parameter order in documentation
Changed parameter order in documentation of findEssentialMat, because threshold and probability were switched.
Changed parameter order in documentation of findEssentialMat, because threshold and probability were switched.
fixed a doxygen issue
fixed ABI incompatibilities as proposed by alalek
related to issue 4969
fixes issue 5891
fixes issue 5922
related to issue 4969
fixes issue 5891
fixes issue 5922
Enable NEON for the arm64 architecture too
and fix the compilation for iOS in the same time
and fix the compilation for iOS in the same time
Add LLVM c++_static c++_shared STL targets
The Android NDK would be moving to Clang as its default compiler
in the future. This patch allows OpenCV to build with the default
c++_shared / c++_static
TEST=Builds OpenCV with -DANDROID_TOOLCHAIN_NAME=
aarch64-linux-android-clang3.6 -DANDROID_STL=c++_shared
The Android NDK would be moving to Clang as its default compiler
in the future. This patch allows OpenCV to build with the default
c++_shared / c++_static
TEST=Builds OpenCV with -DANDROID_TOOLCHAIN_NAME=
aarch64-linux-android-clang3.6 -DANDROID_STL=c++_shared
fixing issue #4969 of Itseez/opencv.
Someone forgot to wrap the load function for SVMs in the
corresponding ml python module. Fixed that.
Someone forgot to wrap the load function for SVMs in the
corresponding ml python module. Fixed that.
Merge pull request #5771 from dtmoodie:pyrlk
Merge pull request #5916 from berak:NormalBayesClassifier_bulk_prediction
ml: fix NormalBayesClassifier bulk prediction(#5911)
Merge pull request #5861 from alalek:fix_pkgconfig
Merge pull request #5906 from berak:fix_marker
Merge pull request #5904 from GregoryMorse:master
Merge pull request #5902 from alalek:fix_gpu_samples
Merge pull request #5883 from alalek:fix_5876
Merge pull request #5881 from alalek:fix_5878
Merge pull request #5880 from alalek:fix_5863
Merge pull request #5873 from paroj:cpprodrigues
May be it can solve issue 5908
opencv_core: CUDA: check if __CUDA_ARCH__ is defined before comparing it
Changed statements of type "#if __CUDA_ARCH__ >= 200" to
"#if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 200" in order to
avoid warnings about __CUDA_ARCH__ being undefined.
Changed statements of type "#if __CUDA_ARCH__ >= 200" to
"#if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 200" in order to
avoid warnings about __CUDA_ARCH__ being undefined.
fix cv::MARKER_TRIANGLE_UP
WinRT consistency
gpu samples: fix REMOVE_ITEM error
Modified sparse pyrlk optical flow to allow input of an image pyramid which thus allows caching of image pyramids on successive calls.
Added unsigned char support for 1, 3, 4 channel images.
Added unsigned char support for 1, 3, 4 channel images.
Support for opengl2 in vtk 7.1
added regression test for #5876
also port Rodrigues in Affine to Matx expressions
so results are numerically equivalent
so results are numerically equivalent
fix normalize in case of inplace operations
fixes #5876
fixes #5876
solve videoio/src/cap_mjpeg_decoder.cpp compiling problem using VS 2008
fixes #5878
fixes #5878
features2d agast: clear in/out keypoints container
fixes #5863
fixes #5863
calib3d: port Rodrigues to cpp primitives
Merge pull request #5840 from paroj:v4ldefault
Merge pull request #5860 from Dikay900:patch-1
Merge pull request #5868 from atinfinity:pullreq/151223-FindTBB-VS2015
Merge pull request #5866 from Dikay900:patch-2
Merge pull request #5865 from Dikay900:fix_matcopy_shape
Merge pull request #5856 from Dikay900:fix_rgb2luv_doc
changed to find TBB library(VS2015)
fix uninitialized matrix in EM::predict fixes #5443
fixes #5443
fixes #5443
fix mat copy in shape
fixes #5643
fixes #5643
fix probably copy paste like error in rgb2luv doc
fixes #5689
fixes #5689
Merge pull request #5854 from Dikay900:em_predict_fix
pkg-config: modules list contains only OpenCV modules (fixes #5852)
[master] Fixed PCH warning during ARM crosscompilation
#5858 for master
#5858 for master
fix reshape call not being an inplace method
fixes #5853 #4740
fixes #5853 #4740