mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-12 15:19:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
19,117 Commits 6 Branches 127 Tags 3 GiB
9e53f03968
Commit Graph

13684 Commits

Author SHA1 Message Date
Alexander Alekhin
8c591ebd77 Merge pull request #6060 from alalek:fix_opencl_opengl_sharing_6052 2016-02-16 07:10:02 +00:00
Maksim Shabunin
1aeff45631 Merge pull request #6103 from mshabunin:add-get-samples 2016-02-15 13:11:28 +00:00
Marina Noskova
02cd8cf039 Deleted illegal type values. 2016-02-15 15:09:59 +03:00
Marina Noskova
ff54952769 Corrected spelling mistakes 2016-02-15 14:35:36 +03:00
Rahul Chhabra
232f564011 Update imgproc.hpp 
In reference to Issue #6110, the order of markerType and color is changed.
 2016-02-14 10:18:14 +05:30
Ilya Lavrenov
068769263e fixed compilation warning 2016-02-12 18:12:20 +03:00
Alexander Alekhin
f48cda2f95 test: initialize test data in test_umat.cpp (6102) 2016-02-12 13:15:15 +03:00
Maksim Shabunin
54abb83c82 ml: moved getTestSamples implementation to src 2016-02-12 12:32:26 +03:00
ahb
15793b1301 add TestData::getTestSamples() 2016-02-12 12:11:10 +03:00
Alexander Alekhin
80102b76f9 Merge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility 2016-02-11 15:00:52 +00:00
Alexander Alekhin
c7bdbef504 ocl: fix OpenGL sharing detection (6052) 
Apple OpenCL framework hasn't OpenGL sharing extension
 2016-02-11 12:46:22 +03:00
Alexander Alekhin
87bbaa2c27 ocl: OpenCL headers are located in "CL" subfolder (3rdparty/include) 2016-02-11 12:44:45 +03:00
Alexander Alekhin
2c4ed7f8a5 Merge pull request #6051 from mshabunin:fix-cap-qtkit 2016-02-10 17:35:20 +00:00
Alexander Alekhin
5efadcb335 Merge pull request #6042 from Dmitry-Me:reduceVariablesScope 2016-02-10 17:33:43 +00:00
Marina Noskova
5496dedd6a Fixed warnings. 2016-02-10 19:46:24 +03:00
Marina Noskova
0307dd19fd Minor fix in declaration of SVMSGD::setOptimalParameters 2016-02-10 18:21:45 +03:00
Marina Noskova
617dd5db5b Fixed doc/opencv.bib 2016-02-10 17:57:36 +03:00
Marina Noskova
c522172367 Fixed small bug in SVMSGD::clear(). 2016-02-10 16:59:12 +03:00
Marina Noskova
05353a1492 Removed trailing whitespaces 2016-02-10 16:59:12 +03:00
Marina Noskova
41c0a38344 Fixed test samples for tests with different borders 
Added new test (separating two points)
 2016-02-10 16:59:12 +03:00
Marina Noskova
bfdca05f25 Added margin type, added tests with different scales of features. 
Also fixed documentation, refactored sample.
 2016-02-10 16:59:12 +03:00
Marina Noskova
acd74037b3 Increasing the dimension of features space in the SVMSGD::train function. 2016-02-10 16:59:11 +03:00
Marina Noskova
40bf97c6d1 Refactored SVMSGD class 2016-02-10 16:56:14 +03:00
joao.faro
a2f0963d66 SVMSGD class added 2016-02-10 16:53:15 +03:00
Marian Zajko
c21657336b 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.
 2016-02-09 10:36:22 +01:00
Alexander Alekhin
e4dc479e95 Merge pull request #6088 from mshabunin:fix-exif-parsing 2016-02-08 16:01:07 +00:00
Maksim Shabunin
112aa49104 ExifReader::getFormat : check buffer length before accessing, fixes 6059 2016-02-08 17:14:55 +03:00
Steven Puttemans
cd96df1407 Update mat.hpp 2016-02-08 13:26:06 +01:00
Steven Puttemans
a70c54f2c5 Added suggestions from PR6068 
As discussed here: https://github.com/Itseez/opencv/pull/6068#issuecomment-180797723
 2016-02-08 10:20:08 +01:00
Alexander Alekhin
c09b6000c6 ffmpeg: compatibility guard for interrupt callback feature 2016-02-06 15:20:36 +03:00
StevenPuttemans
873399705d add clarification on the acces paramter of the at operator 2016-02-05 13:21:40 +01:00
Alexander Alekhin
b148ef2b1f Merge pull request #6053 from peters:master 2016-02-04 19:33:20 +00:00
Peter Rekdal Sunde
da48061910 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.
 2016-02-04 18:09:14 +01:00
Alexander Alekhin
b2d44663fd Merge pull request #6058 from sturkmen72:documentation_fix_cv_repeate 2016-02-04 15:14:02 +00:00
StevenPuttemans
89df7923a7 revert PR 5362 2016-02-04 13:20:21 +01:00
Vadim Pisarevsky
56c89e0a98 Merge pull request #6014 from alalek:fix_5991 2016-02-04 09:54:27 +00:00
Suleyman TURKMEN
194b865daf update documentation of cv::repeat 2016-02-03 23:36:30 +02: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
Maksim Shabunin
a2bda99921 MacOSX / QTKit capture: trying to fix invalid timer call 2016-02-02 14:30:37 +03: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
Dmitry-Me
bf604f1780 Reduce variables scope 2016-02-01 11:10:13 +03:00
atinfinity
69eaa89e22 fixed to use NVCUVID in 'cudacodec' module. 2016-01-31 01:56:45 +09: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
Vitaly Tuzov
f01f1bc5e6 Fixed "Conditional jump or move depends on uninitialised value(s)" valgrind issue due to wrong pointer recalculation for zero level of pyramid. 2016-01-21 12:54:08 +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
Elena Gvozdeva
bb1c2d71a8 fix bug on border at pyrUp 2016-01-20 13:07:07 +03: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
Vitaly Tuzov
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.
 2016-01-18 12:54:53 +03: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
Vitaly Tuzov
4f5d585184 Update call to Tegra optimized morphology filtering 2016-01-15 11:48:29 +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
takacsd
537d1322b4 Add missing implementation to one of the Mat_<_Tp> constructor. (#5945) 2016-01-11 16:05:22 +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
Alexander Karsakov
6e22020dad Fixed pnpTask: don't copy inliers vector in case it's empty. 2016-01-11 11:39:18 +03: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
Christoph Spörk
6c8bc6a25b fixed ABI incompatibilities as proposed by alalek 
related to issue 4969
fixes issue 5891
fixes issue 5922
 2016-01-07 08:00:01 +01:00
Christoph Spörk
a7aa198b4c fixing issue #4969 of Itseez/opencv. 
Someone forgot to wrap the load function for SVMs in the
corresponding ml python module. Fixed that.
 2016-01-04 15:47:26 +01:00
Alexander Alekhin
345678770b Merge pull request #5771 from dtmoodie:pyrlk 2016-01-04 14:28:31 +00:00
berak
5afd0e211e ml: fix NormalBayesClassifier bulk prediction(#5911) 2016-01-04 11:47:08 +01:00
Alexander Alekhin
1e4ad333a1 Merge pull request #5906 from berak:fix_marker 2016-01-04 05:31:00 +00:00
Alexander Alekhin
c06eaf83da Merge pull request #5904 from GregoryMorse:master 2016-01-04 05:30:28 +00:00
Alexander Alekhin
76c9714516 Merge pull request #5883 from alalek:fix_5876 2016-01-04 05:28:41 +00:00
Alexander Alekhin
512e73db89 Merge pull request #5881 from alalek:fix_5878 2016-01-04 05:27:37 +00:00
Alexander Alekhin
9012ff4711 Merge pull request #5880 from alalek:fix_5863 2016-01-04 05:27:22 +00:00
LaurentBerger
8531e6d9fc May be it can solve issue 5908 2016-01-02 21:06:51 +01:00
Rok Mandeljc
029dfbc89d 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.
 2016-01-01 23:48:57 +01:00
berak
2d1cb14e61 fix cv::MARKER_TRIANGLE_UP 2016-01-01 10:10:01 +01:00
Gregory Morse
5427ede6a1 WinRT consistency 2015-12-31 14:31:26 +01:00
Dan Moodie
66738d748f 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.
 2015-12-29 10:48:14 -05:00
Alexander Alekhin
17e4d33b0e added regression test for #5876 2015-12-25 16:16:34 +03:00
Pavel Rojtberg
4db6d9986d also port Rodrigues in Affine to Matx expressions 
so results are numerically equivalent
 2015-12-25 13:47:10 +01:00
Alexander Alekhin
6997d423c8 fix normalize in case of inplace operations 
fixes #5876
 2015-12-25 15:33:06 +03:00
HMM@T430s-x64
6b4d4a85b5 solve videoio/src/cap_mjpeg_decoder.cpp compiling problem using VS 2008 
fixes #5878
 2015-12-25 13:57:26 +03:00
Alexander Alekhin
3d85e7ac0d features2d agast: clear in/out keypoints container 
fixes #5863
 2015-12-25 13:49:24 +03:00
Pavel Rojtberg
ac481e6174 calib3d: port Rodrigues to cpp primitives 2015-12-24 21:34:34 +01:00
Alexander Alekhin
a4aeba37fb Merge pull request #5866 from Dikay900:patch-2 2015-12-23 16:14:53 +00:00
Alexander Alekhin
8c545c055d Merge pull request #5865 from Dikay900:fix_matcopy_shape 2015-12-23 16:14:36 +00:00
Alexander Alekhin
f26d0c5857 Merge pull request #5856 from Dikay900:fix_rgb2luv_doc 2015-12-23 16:14:06 +00:00
Philip
1ba2286c6d fix uninitialized matrix in EM::predict fixes #5443 
fixes #5443
 2015-12-23 11:19:48 +01:00
Dikay900
bb78b01ace fix mat copy in shape 
fixes #5643
 2015-12-23 10:48:36 +01:00
Dikay900
a7d3e30404 fix probably copy paste like error in rgb2luv doc 
fixes #5689
 2015-12-22 22:45:51 +01:00
Dikay900
4f3b58d1e7 fix reshape call not being an inplace method 
fixes #5853 #4740
 2015-12-21 21:10:35 +01:00
Alexander Alekhin
afdbd855ee Merge pull request #5843 from jia-kai:disable-dlopen-opencl 2015-12-21 15:47:15 +00:00
Maksim Shabunin
7cb78451d1 Backported several changes from master branch: 
- #3771 - inline round on ARM
- #5633 - documentation for MSER
- #5666 - run.py fixes
 2015-12-21 18:20:37 +03:00
Alexander Alekhin
4cfe2b4dea Merge tag '3.1.0' 
OpenCV 3.1.0
 2015-12-21 14:24:46 +03:00
jiakai
22599a2812 define g_haveOpenCL only when HAVE_OPENCL is set 2015-12-21 16:42:38 +08:00
jiakai
387214a3c5 do not open libopencl by dlopen if HAVE_OPENCL is not set 2015-12-21 12:04:00 +08:00
Maksim Shabunin
92387b1ef8 Fix java version++ 2015-12-18 18:02:16 +03:00
Maksim Shabunin
8d1f5b5490 Version++ for android 2015-12-18 17:57:07 +03:00
Alexander Alekhin
94e4498cfd Version for 3.1.0 release 2015-12-18 16:08:05 +03:00
Alexander Alekhin
3ee90a1ff4 ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings) 2015-12-18 15:59:02 +03:00
Alexander Alekhin
34957bcfed Merge pull request #5832 from alalek:python_samples 2015-12-18 11:38:27 +00:00
Vadim Pisarevsky
97dc5be841 Merge pull request #5821 from alalek:build_framework 2015-12-18 10:12:55 +00:00
Alexander Alekhin
323e24e3ef change links from samples/python2 to samples/python 2015-12-18 11:00:30 +03:00
Vadim Pisarevsky
d02627ea89 Merge pull request #5825 from GregoryMorse:master 2015-12-18 07:17:29 +00:00
Gregory Morse
af5bec70cd merge Win10/VS2015 changes 2015-12-17 21:15:59 +01:00
Vadim Pisarevsky
9aeb8c8d5a Merge pull request #5810 from mshabunin:hal_interface 2015-12-17 16:48:02 +00:00
Alexander Alekhin
be23846c4e update osx and ios build_framework.py 2015-12-17 16:17:31 +03:00
Alexander Alekhin
437fbe2594 Merge pull request #5817 from alalek:fix_ocl_buffer_pool 2015-12-17 11:54:28 +00:00
Alexander Alekhin
0862e8e34c fix build 2015-12-17 13:25:10 +03:00
Maksim Shabunin
84f37d352f HAL moved back to core 2015-12-17 12:33:23 +03:00
Maksim Shabunin
3c6aa650a1 Merge pull request #5811 from mshabunin:fix-java-moments 2015-12-16 13:12:01 +00:00
Alexander Alekhin
6f2632ca2e ocl: fix buffer pool small allocations issue (fixes #5815) 2015-12-16 14:31:26 +03:00
Vadim Pisarevsky
b2bb7d075a Merge pull request #5781 from jet47:fix-cuda-createContinuous 2015-12-16 10:37:56 +00:00
Vadim Pisarevsky
3bbd22cb63 Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo 2015-12-16 10:36:29 +00:00
Maksim Shabunin
5ebc7f0b72 Simple Moments class for Java 2015-12-16 10:53:14 +03:00
Maksim Shabunin
574280cd3a Merge pull request #5784 from alalek:distrib_fix 2015-12-15 12:24:36 +00:00
Cédric Rousseau
76e4b0a8fe Reverts "Set the default value of exposure_weight in createMergeMertens to 1.0" because it breaks source code compatibility and tests 
This reverts commit dbfd6a3dde.
 2015-12-15 13:16:15 +01:00
Vadim Pisarevsky
1e443a6ea6 Merge pull request #5800 from taketwo:fix-merge-debevec 2015-12-15 10:26:00 +00:00
Vadim Pisarevsky
f93a4dfbc9 Merge pull request #5799 from alalek:fix_5066 2015-12-15 10:24:39 +00:00
Vadim Pisarevsky
34129d8e83 Merge pull request #5806 from IshankGulati:cv-merge-documentation 2015-12-15 10:16:21 +00:00
Cédric Rousseau
dbfd6a3dde Set the default value of exposure_weight in createMergeMertens to 1.0 2015-12-15 11:12:10 +01:00
Vadim Pisarevsky
c5d4ecae37 Merge pull request #5588 from T-Dunker:ScheimpflugModel 2015-12-15 10:11:59 +00:00
Cédric Rousseau
d19189e80f Fixed the formula to compute the well-exposedness weight map. 2015-12-15 10:30:06 +01:00
Ishank gulati
d1ac75cabd corrected cv::merge documentation 2015-12-15 11:02:08 +05:30
Sergey Alexandrov
08b30580b7 Do not modify input parameter in MergeDebevec 
MergeDebevec takes camera response function as an optional input
parameter. Despite being clearly marked as input, this matrix is
overwritten during processing.

This commit adds a temporary matrix to store the log response and avoid
modification of the input.
 2015-12-14 22:24:27 +01:00
Vadim Pisarevsky
aee03cd5e5 Merge pull request #5796 from alalek:fix_5019 2015-12-14 19:52:32 +00:00
Alexander Alekhin
1305962af7 fixes #5066: laplacian: "y" may contain negative values 2015-12-14 18:13:57 +03:00
Thomas Dunker
6882c10b45 Extension of the camera distortion model for tilted image sensors (Scheimpflug condition) including test 2015-12-14 15:20:34 +01:00
Alexander Alekhin
0db10a3052 fixes #5019: python and java bindings become CMake modules (loadable plugins) 2015-12-14 16:20:18 +03:00
Alexander Alekhin
5c15461595 UMat access flags (fixes #5095) 2015-12-14 14:26:43 +03:00
Alexander Alekhin
a153871940 disable ts module if it is not used: BUILD_TESTS=OFF and BUILD_PERF_TESTS=OFF 2015-12-12 15:23:31 +03:00
Alexander Alekhin
1836d41b5c warning fix (MSVS2015) 2015-12-12 15:23:31 +03:00
Vadim Pisarevsky
5cdf0e3e89 Merge pull request #5351 from paroj:calibout 2015-12-11 16:21:06 +00:00
Vadim Pisarevsky
e0395a79ec Merge pull request #5616 from afriesen:lr_predict 2015-12-11 12:22:56 +00:00
Pavel Rojtberg
60c06e551a calibrateCamera: do not require rvec and tvec to be vector<Mat> 
if they are not we also do not need to allocate a local copy of the rvec
and tvec
 2015-12-11 11:01:57 +01:00
Pavel Rojtberg
205775ed52 calibrateCamera: only allocate and compute rvecs, tvecs when needed 
also replace C defines with C++ enums
 2015-12-11 10:58:26 +01:00
Vadim Pisarevsky
21b415f6be Merge pull request #5691 from paroj:levmarqLU 2015-12-11 08:39:05 +00:00
Vadim Pisarevsky
286ba8cffd Merge pull request #5783 from vpisarev:ml_fixes 2015-12-11 06:25:15 +00:00
Pavel Rojtberg
b5ddaae427 calib3d: add CALIB_USE_LU to use LU decomposition in solver 2015-12-10 23:26:37 +01:00
Pavel Rojtberg
4c251bd260 CvLevMarq: add solve method to interface 2015-12-10 23:02:18 +01:00
Pavel Rojtberg
22b64e2c28 CvLevMarq: remove fixed rows instead of setting them to zero 
use the same approach like in fisheye calibration: instead of setting
masked out rows to zero, remove them from the equation system.
This way JtJ does not become singular and we can use the much faster LU
decomposition instead of SVD.

This results in a speedup of the Calibrate unit tests of 3x-10x.
 2015-12-10 23:02:18 +01:00
Pavel Rojtberg
9d89c369f8 update SOLVEPNP documentation 2015-12-10 23:02:17 +01:00
Vadim Pisarevsky
7a7b0bcfcb fixed the upper boundary when calling checkRange (thanks to alalek) 2015-12-10 20:17:17 +03:00
Deanna Hood
0d706f6796 Return uncompressed support vectors for getSupportVectors on linear SVM (Bug #4096) 2015-12-10 18:31:02 +03:00
Vadim Pisarevsky
544990e377 couple of small fixes in rtrees variable importance calculation 2015-12-10 18:13:54 +03:00
Vadim Pisarevsky
fda17273de applying patch by rxtsolar: https://github.com/Itseez/opencv/pull/5422 for the master branch (even though it's actually not that important here) 2015-12-10 18:10:27 +03:00
niederb
d8e3971e7f Fixed variable importance in rtrees 2015-12-10 18:09:15 +03:00
Vadim Pisarevsky
d2e169929c Merge pull request #5767 from dtmoodie:cpu_mat_memory_allocator 2015-12-10 14:32:04 +00:00
Vadim Pisarevsky
bb4b4acce5 Merge pull request #5776 from alalek:checkRange_fixes 2015-12-10 13:26:46 +00:00
Vadim Pisarevsky
bfe5ed23cd Merge pull request #5657 from tianzhi0549:fixed-the-type-inconsistent-with-document 2015-12-10 13:24:13 +00:00
Vladislav Vinogradov
5576c0866a fix #5780 : cv::cuda::createContinuouseffectively ignores its cols argument 2015-12-10 14:20:28 +03:00
Vadim Pisarevsky
a0f6cd8df5 Merge pull request #5362 from Dikay900:cascade_reject_stage 2015-12-10 10:51:42 +00:00
Vadim Pisarevsky
6ead99985f Merge pull request #4086 from IgnasD:cameraMat_five-point 2015-12-10 09:37:43 +00:00
Alexander Alekhin
5aa4b74115 Merge pull request #5723 from dtmoodie:win_gst 2015-12-10 07:19:10 +00:00
Vadim Pisarevsky
3c8bd19e56 Merge pull request #5309 from paroj:sampsonDist 2015-12-10 07:08:18 +00:00
Vadim Pisarevsky
5d6292fc97 Merge pull request #5675 from paroj:fisheyecalib 2015-12-10 07:07:12 +00:00
Alexander Alekhin
b26580cc7b checkRange fixes 
1) fix multichannel support
2) remove useless bad_value, read value from original Mat directly
3) add more tests
4) fix docs for cvCeil and checkRange
 2015-12-09 18:31:27 +03:00
Dan
46ec9c386b Gstreamer 1.0 on windows. 2015-12-09 09:11:45 -05:00
Vadim Pisarevsky
8e67f0ba84 Merge pull request #5774 from mshabunin:coverity_fixes 2015-12-09 13:32:44 +00:00
Vadim Pisarevsky
05531cd7c4 Merge pull request #5768 from cbalint13:kaze_akaze 2015-12-09 13:18:25 +00:00
Vadim Pisarevsky
919fc443fb Merge pull request #5770 from emiswelt:master 2015-12-09 12:19:53 +00:00
Vadim Pisarevsky
35d4f998fd Merge pull request #5748 from songyuncen:fix#5745 2015-12-09 12:17:41 +00:00
Maksim Shabunin
2cda78ffac Valgrind: fixed uninitialized image usage in descriptors regression tests 2015-12-09 14:25:09 +03:00
Maksim Shabunin
832a03821d Valgrind: do not use uninitialized data in optflow 2015-12-09 14:25:08 +03:00
Maksim Shabunin
4a294775da Coverity: fixed uninitialized field in ExifReader 2015-12-09 14:25:08 +03:00
Maksim Shabunin
a9607c8531 Coverity: fixed uninitialized fields in test_goodfeaturetotrack 2015-12-09 14:25:08 +03:00
Maksim Shabunin
a921761d18 Coverity: memory leak in OpenEXR reader 2015-12-09 14:25:08 +03:00
Maksim Shabunin
f814218640 Coverity: uninitialized fields in Stitcher 2015-12-09 14:25:08 +03:00
Maksim Shabunin
715887fcd5 Coverity: fixed some negative argument issues 2015-12-09 14:25:08 +03:00
Maksim Shabunin
fc641e2bde Coverity: uninitialized values in ExifEntry_t structure 2015-12-09 14:17:46 +03:00
Gregory Morse
bcf78daed2 Update CMakeLists.txt 
WinRT parallels library is causing conflicts in VC++ due to inconsistent usage with C++/CX which is now present in parallels.cpp.  This support should be included in all projects with WinRT specific code except if doing special native C++ tasks.
 2015-12-09 03:45:10 +01:00
Gregory Morse
1ab7acf015 Update CMakeLists.txt 
Fix C++/CX support for all WINRT and bring back native-mode only support which was removed
 2015-12-09 03:42:25 +01:00
songyuncen
9d8118dee5 build failed, trailing whitespace. 2015-12-09 08:00:42 +08:00
emiswelt
2e9ef3f9e3 Changed parameter order of cv::stereoRectify in documentation, 
so it matches the code.
 2015-12-08 22:28:32 +00:00
Balint Cristian
0087c57e0d Fix KAZE/AKAZE descriptors to use angle instead radians. 2015-12-08 22:04:41 +02:00
Vadim Pisarevsky
d6f8a75e91 Merge pull request #5230 from PhilLab:patch-4 2015-12-08 18:46:34 +00:00
Dan
237f33d4f0 nullptr -> NULL 2015-12-08 12:19:15 -05:00
Vadim Pisarevsky
a15707bc57 Merge pull request #5765 from alalek:pthread_mutex_init 2015-12-08 16:49:41 +00:00
Vadim Pisarevsky
9d624f82c0 Merge pull request #5670 from askourik:opencv_agast_tree 2015-12-08 16:46:11 +00:00
Dan
76760470f3 Cherry pick failed to grab interface changes. 2015-12-08 09:54:14 -05:00
Dan Moodie
4f373a4284 Clarified default allocator interface. 
Conflicts:
	modules/core/src/matrix.cpp
 2015-12-08 09:45:13 -05:00
songyuncen
e0b7389dc3 remove compile warnings in shapedescr.cpp 2015-12-08 22:23:23 +08:00
songyuncen
a69eeb6b1f change the algorithm of minimum enclosing circle with EMO Welzl's method 2015-12-08 21:38:59 +08:00
Vadim Pisarevsky
0de6165863 Merge pull request #5660 from jet47:cuda-wrap-stream-3.0 2015-12-08 12:28:57 +00:00
Vadim Pisarevsky
9c0a5523e4 Merge pull request #5757 from alalek:merge-2.4 2015-12-08 11:51:29 +00:00
Alexander Alekhin
78376c0f63 pthreads: remove usage of non-POSIX PTHREAD_RECURSIVE_MUTEX_INITIALIZER* defines 
related issues: #5423 #5476
 2015-12-08 13:55:02 +03:00
Vadim Pisarevsky
ffe0631518 Merge pull request #5735 from Astero92:angle_unit 2015-12-08 10:35:13 +00:00
Vadim Pisarevsky
f95203e93f Merge pull request #5759 from grundman:patch-1 2015-12-08 10:33:54 +00:00
Maksim Shabunin
387935e94c Merge pull request #5756 from mshabunin:smooth_neon_fix 2015-12-08 08:59:58 +00:00
Maksim Shabunin
878ec080c7 Merge pull request #3540 from AlexanderUsentsov:good_feature 2015-12-08 08:02:28 +00:00
Alexander Alekhin
d86d8ed909 Merge 2.4 into master 
PR #2968: cce2d99 8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher

The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.

PR #3236: 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.

PR #3190
fix blobdetector

PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.

PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h

PR #3792: afdf319
Add -L for CUDA libs path to pkg-config

Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.

PR #3893: 122b9f8
Turn ocv_convert_to_lib_name into a function

PR #5490: ec5244a
fixed memory leak in findHomography tests

PR #5491: 0d5b739
delete video readers

PR #5574

PR #5202
 2015-12-08 10:24:54 +03:00
Florent
056a111788 Fixed histogram substraction bug with NEON instructions (arguments in wrong order). 2015-12-08 09:48:17 +03:00
grundman
2f0a598ac8 Update imgwarp.cpp 
github editor does not show white space and inserts one for you ... great combination
 2015-12-07 11:48:45 -08:00
grundman
5772cb52e3 Update imgwarp.cpp 
Check for identity resize => use copy instead (1.37 ms -> 0.07 ms on 720p)
 2015-12-07 11:25:39 -08:00
ausentso
9abdf39c90 added test for goodFeaturesToTrack; 2015-12-07 15:24:38 +03:00
Vadim Pisarevsky
7172c16435 Merge pull request #5717 from jet47:cuda-maxwell-fixes 2015-12-07 10:16:48 +00:00
Vadim Pisarevsky
d19897b734 Merge pull request #5651 from hoangviet1985:fix_solvePoly_3.0.0 2015-12-07 10:12:54 +00:00
Vadim Pisarevsky
d4245aa45c Merge pull request #5704 from sturkmen72:patch-3 2015-12-07 10:09:57 +00:00
Vadim Pisarevsky
54c1637ba1 Merge pull request #5743 from mshabunin:hal_extend 2015-12-07 10:01:22 +00:00
Keita Kita
1621043bd2 Add documentation about detail of image type 
connectedComponents and connectedComponentsWithStats in
imgproc accept 8-bit single channel image only for input.
 2015-12-06 14:06:17 +09:00
songyuncen
b81598bc03 try to fix : enclosing circle always larger than 1.0 
issue #5745
 2015-12-05 10:57:29 +08:00
Suleyman TURKMEN
8418d564a8 Documentation patch for cv::mixChannels 2015-12-03 22:49:28 +02:00
Maksim Shabunin
0e5c710757 Fix documentation warning 2015-12-03 17:30:45 +03:00
Maksim Shabunin
5c5d0e6743 Fixed NEON compilation issue 2015-12-03 15:41:23 +03:00
Maksim Shabunin
5473dbebed Fixed some build issues 2015-12-03 15:25:42 +03:00
Maksim Shabunin
b5d6d7016c Merge pull request #5741 from PolarNick239:master 2015-12-03 12:00:21 +00:00
Maksim Shabunin
98f5fcd86e HAL: fixed header path 2015-12-03 14:56:15 +03:00
Maksim Shabunin
b4bcdd10a1 HAL: improvements 
- added new functions from core module: split, merge, add, sub, mul, div, ...
- added function replacement mechanism
- added example of HAL replacement library
 2015-12-03 14:43:37 +03:00
Alexander Alekhin
e8742be30b Merge pull request #5742 from GabrieleDalmazzone:GabrieleDalmazzone-patch-1 2015-12-03 10:29:22 +00:00
Nikolay Polyarniy
8026824563 ts module: includes moved out from cvtest namespace 2015-12-03 00:15:38 +03:00
Dominik Kleiser
0ba66aa5b9 Merge remote-tracking branch 'origin/master' into angle_unit 2015-12-02 18:39:12 +01:00
Alexander Alekhin
d5894ef2a8 Merge pull request #5572 from paroj:nov4l1 2015-12-02 16:49:59 +00:00
Dominik Kleiser
0c471515fd use float for CV_PI 2015-12-02 17:33:40 +01:00
Dominik Kleiser
c7cb028035 use floats for the calculation 2015-12-02 16:38:44 +01:00
Dominik Kleiser
767bae44ae Fix the unit of angle for AKaze/Kaze KeyPoints 
Convert the return value of getAngle from radian to degrees.
 2015-12-02 11:51:37 +01:00
Pavel Vlasov
2b27f7dbb3 Fixed warnings for IPP9+ build; 2015-12-01 16:10:29 +03:00
GabrieleDalmazzone
5a72be08fd Race condition bug-fix in hog.cu 
See https://github.com/Itseez/opencv/issues/5721

COMMENTS:
* The second __syncthreads() is necessary, I am sure of that.
* The code works without the first __syncthreads() too, but I have however added it for symmetry. Anyway it doesn't affect time performances, I have checked it with some profiling with nvvp
 2015-12-01 09:19:31 +01:00
Alexander Alekhin
a0f8645541 Merge pull request #5708 from comdiv:#5707 2015-11-30 09:52:16 +00:00
Alexander Alekhin
8524d46fee Merge pull request #5633 from mshabunin:doc-mser 2015-11-30 09:48:39 +00:00
Alexander Alekhin
e860ed7689 Merge pull request #5714 from ajbernal:OCL_HOG_Fix 2015-11-30 09:44:37 +00:00
Alexander Smorkalov
53ed1a8c03 Build fix for QNX 6.6 neitrino. 2015-11-30 10:28:04 +03:00
Vladislav Vinogradov
1bef1b8d16 disable sanity tests for AlphaComp and PyrLKOpticalFlowDense 2015-11-27 16:46:47 +03:00
Vladislav Vinogradov
2b26094cf5 increase epsilons in some tests: 
* MulSpectrums
* StereoConstantSpaceBP
* BruteForceNonLocalMeans
 2015-11-27 16:46:20 +03:00
Vladislav Vinogradov
2afb02fcb4 fix BORDER_WRAP processing on Maxwell generation 2015-11-27 16:45:26 +03:00
Ariel Bernal
5c8683139f Fix for #5710. OpenCL HOG Object detect assigns the wrong SIMD size. 
In oder to guarantee SIMDness between the two compilation steps we choose the
highest SIMD size that is optimized in the kernel for the first step.
 2015-11-25 16:20:04 -08:00
Pavel Rojtberg
16fcd78f03 add sampson distance error measure 
the first order approximation of the geometric error
 2015-11-25 16:39:49 +01:00
comdiv
81c746c2a8 32bit BITFIELDS compresion codec support #5707 Fixed 
wsfixed
 2015-11-25 00:03:35 +05:00
askourik
fedf064088 removing code duplicates and replace unsigned long by uint32_t 2015-11-23 23:47:23 +03:00
askourik
b3e8c65e5e removed code duplication for non-intel platforms 2015-11-23 22:41:35 +03:00
askourik
4cf7ddfd87 Added new function definition in AGAST module header for tree-optimized version 2015-11-23 22:11:01 +03:00
Vadim Pisarevsky
152874eaed Merge pull request #5620 from paroj:calibratecpp 2015-11-23 18:35:25 +00:00
Vadim Pisarevsky
76f54b51c1 Merge pull request #5661 from mbarann:fix_msmf_write_vertically_flipped_video 2015-11-23 18:34:30 +00:00
Alexander Alekhin
c9cba6433e Merge pull request #5698 from lupustr3:pvlasov/ipp9_fixes 2015-11-23 16:28:03 +00:00
Vadim Pisarevsky
313dc32606 Merge pull request #5644 from hoangviet1985:splitError 2015-11-23 13:43:38 +00:00
Vadim Pisarevsky
42001234ab Merge pull request #5390 from StevenPuttemans:add_markers_2.4 2015-11-23 13:40:00 +00:00
Vadim Pisarevsky
d4d1d03455 Merge pull request #5635 from mzajko:xi_update 2015-11-23 13:34:23 +00:00
Pavel Vlasov
7375383d26 Canny IPP Sobel getBufferSize wrong func fix; 2015-11-23 14:31:22 +03:00
Maksim Shabunin
9a66191ea8 Merge pull request #5571 from jas0n1ee:master 2015-11-23 09:52:41 +00:00
Maksim Shabunin
bd53a30e76 Merge pull request #5658 from berak:akaze_fix 2015-11-23 09:51:23 +00:00
hoangviet1985
e679d97100 remove redundant code 2015-11-22 14:32:18 -05:00
Maksim Shabunin
04f70c92a8 Merge pull request #5449 from rokm:stereo-fixes 2015-11-22 18:30:16 +00:00
Maksim Shabunin
3ae21095df Merge pull request #5448 from Milania1:doc_normalize 2015-11-22 18:07:13 +00:00
Maksim Shabunin
626ccfe410 Merge pull request #5525 from Milania1:doc_normTypes 2015-11-22 18:05:46 +00:00
Maksim Shabunin
ddf293a081 Merge pull request #5649 from hoangviet1985:solve_pow(x,3)=0_opencv300 2015-11-22 18:02:40 +00:00
Pavel Rojtberg
cefa1dc5cb switch mask type from vector<int> to vector<uchar> 2015-11-21 00:45:45 +01:00
hoangviet1985
3e96b724c2 squash 2015-11-20 15:03:32 -05:00
hoangviet1985
b96def885f squash 2015-11-20 14:48:29 -05:00
Maksim Shabunin
5c0cdd4d2d Merge pull request #5650 from hoangviet1985:fix_bug_5623 2015-11-20 16:15:47 +00:00
Maksim Shabunin
f019de6900 Merge pull request #5666 from mshabunin:vs-run-py 2015-11-20 15:53:48 +00:00
Maksim Shabunin
51797d133a Merge pull request #5653 from jia-kai:fix-jpeg-exif 2015-11-20 15:37:50 +00:00
Maksim Shabunin
3cb76d5c66 Merge pull request #5663 from bertmsk:patch-1 2015-11-20 15:28:26 +00:00
Maksim Shabunin
047bda32d8 Merge pull request #5665 from paroj:matx_norm 2015-11-20 15:26:39 +00:00
Maksim Shabunin
3cfd7fcbbf Merge pull request #5681 from sturkmen72:patch-3 2015-11-20 15:18:25 +00:00
Alexander Alekhin
559e1f76f9 Merge pull request #5685 from lupustr3:pvlasov/ipp9_fixes 2015-11-20 12:11:09 +00:00
Pavel Vlasov
9acf93b7c6 IPP Sobel getBufferSize wrong func fix; 2015-11-19 18:38:47 +03:00
Maksim Shabunin
c3cf1be344 fixup! run.py: issues with forced configuration fixed 2015-11-19 15:32:42 +03:00
Alexander Alekhin
e35959fad2 Merge pull request #5671 from PhilLab:patch-7 2015-11-19 10:10:13 +00:00
Rok Mandeljc
7452f9a56e cudastereo: document lack of fractional bits in 16-bit signed format for StereoBeliefPropagation 2015-11-19 11:05:13 +01:00
Rok Mandeljc
1c804124d1 cudastereo: updated documentation for reprojectImage3D and drawColorDisp 
Updated the list of supported input formats, added note about 16-bit
signed format (no fractional bits).
 2015-11-19 11:05:13 +01:00
Rok Mandeljc
980d84e4a2 calib3d: improve documentation of reprojectImageTo3D 
Make a note about 16-bit signed format - the function assumes that
values have no fractional bits (so 16-bit disparity from StereoBM
and StereoSGBM cannot be directly used!)
 2015-11-19 11:05:13 +01:00
Rok Mandeljc
bf5e930468 cudastereo: drawColorDisp: enabled CV_32S and CV_32F disparity formats 2015-11-19 11:05:13 +01:00
Rok Mandeljc
9f82ac18d4 cudastereo: reprojectImageTo3D: enabled CV_32S and CV_32F disparity formats 
This is to achieve parity with the CPU equivalent.
 2015-11-19 11:05:13 +01:00
Maksim Shabunin
739d7caa32 Merge pull request #5659 from jet47:cuda-wrap-stream-2.4 2015-11-19 09:25:36 +00:00
Maksim Shabunin
6148c3525e Merge pull request #5672 from ilya-lavrenov:npp-graphcut 2015-11-19 09:18:23 +00:00
askourik
a6bbe06379 Merge branch 'opencv_agast_tree' of https://github.com/askourik/opencv into opencv_agast_tree 2015-11-19 07:41:55 +03:00
askourik
cc5a1d612e added comments and test perl examples for agast tree version 2015-11-19 07:39:57 +03:00
askourik
ae66ce9d22 Add treelookups for nonintel 2015-11-19 07:06:20 +03:00
Suleyman TURKMEN
99a286ef24 Update imgcodecs.hpp 2015-11-19 00:25:36 +02:00
Maksim Shabunin
eebd4cad66 Fix compilation problems with XCode 7.1.1 and cmake 3.3.2 2015-11-17 18:52:55 +03:00