Vadim Pisarevsky
7fea7e0629
Merge pull request #6697 from wiryls:FileStorageBase64
2016-06-30 17:17:03 +00:00
Andrey Pavlenko
e4cd24537e
Merge pull request #6740 from tomoaki0705:fixNeonCheckSmooth
2016-06-30 15:47:45 +00:00
Alexander Alekhin
8184535de1
samples: repair viz tutorial
2016-06-30 17:21:31 +03:00
Alexander Alekhin
5346870920
Merge pull request #6558 from lletourn:master
2016-06-30 13:44:16 +00:00
Alexander Alekhin
639c8fc6d6
Merge pull request #5870 from IshankGulati:VideoCapture-fix
2016-06-30 13:20:51 +00:00
Alexandr Kondratev
81c69ecd16
highgui: window_gtk.cpp directive boolean operations or/and replaced by ||/&& to keep compatible with older systems
2016-06-29 23:01:57 +03:00
Vitaliy Lyudvichenko
930d96f684
Fixing of AutoBuffer::allocate(nsz) method
...
AutoBuffer::allocate(nsz) didn't work properly when
(sz < nsz < fixed_size). In this case sz remained unchanged.
2016-06-29 19:50:51 +03:00
Alexander Alekhin
c7fc9dc42f
Merge pull request #6707 from tech2077:master
2016-06-29 11:00:49 +00:00
Tomoaki Teshima
78a5aacb22
make NEON more similart to SSE2
2016-06-29 12:11:10 +09:00
PkLab.net
adcdab394b
Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums
...
# Resolved Conflicts:
# modules/videoio/include/opencv2/videoio.hpp
2016-06-28 16:40:30 +02:00
Alexander Alekhin
02edfc8df2
Merge pull request #6730 from sturkmen72:patch-16
2016-06-28 05:36:15 +00:00
Alexander Alekhin
6b511751f5
Merge pull request #6619 from Slonegg:openni2_ir_stream
2016-06-28 05:21:25 +00:00
PkLab.net
f274c592e4
Use copydoc for the list of valid property identifier in VideoCapture and VideoWriter docs
2016-06-27 19:17:51 +02:00
PkLab.net
6c3d8abe2c
Doxygen documentation for CAP_* enums (using current comments in code)
2016-06-27 19:09:23 +02:00
Dmitry Trifonov
f9e6741807
added support for OpenNI2 IR stream #4366
2016-06-27 10:04:59 -07:00
Suleyman TURKMEN
e7ec580318
Update imgcodecs.hpp
2016-06-27 16:38:47 +03:00
Alexandr Kondratev
a4e9712006
Compilate switch-case with GTK_SCROLL_SMOOTH since GTK>=3.4
2016-06-27 13:34:41 +03:00
Suleyman TURKMEN
1b22783d46
Update grfmt_png.cpp
2016-06-26 20:03:03 +03:00
Alexandr Kondratev
fd78e2cc6c
highgui module: removed unused type_mouse_event mouse_wheel
2016-06-25 00:47:22 +03:00
Alexandr Kondratev
3cbd14d61a
pull highgui mouse wheel changes linux into master
2016-06-25 00:42:47 +03:00
Alexandr Kondratev
6020dacc11
highgui module: implemented QT and GTK mouse wheel callback support in linux
2016-06-25 00:18:07 +03:00
MYLS
df5a7c8ee9
build again for OpenCL.
...
I could not find the cause of the error:
```
C:\builds_ocv\precommit_opencl\opencv\modules\ts\src\ts_perf.cpp(361):
error: The difference between expect_max and actual_max is
8445966.0000002384, which exceeds eps, where
expect_max evaluates to 0.9999997615814209,
actual_max evaluates to 8445967, and
eps evaluates to 1.0000000000000001e-005.
Argument "dst0" has unexpected maximal value
```
Hope this is a false alarm.
2016-06-25 02:24:33 +08:00
MYLS
677d4d20ce
fixed an error in the test...
2016-06-25 00:37:13 +08:00
MYLS
959002fb96
solve warnings and errors in test.
2016-06-24 23:41:40 +08:00
MYLS
7c92ee2e6e
Split cvWriteRawData_Base64
into three functions
...
The three new functions:
```cpp
void cvStartWriteRawData_Base64(::CvFileStorage * fs, const char* name,
int len, const char* dt);
void cvWriteRawData_Base64(::CvFileStorage *
fs, const void* _data, int len);
void
cvEndWriteRawData_Base64(::CvFileStorage * fs);
```
Test is also updated. (And it's remarkable that there is a bug in
`cvWriteReadData`.)
2016-06-24 22:27:42 +08:00
Suleyman TURKMEN
d2bad6febb
cv::TickMeter class addition
2016-06-23 19:06:57 +03:00
Matthew Skolaut
f861d0d643
merge #ifs in highgui bindings
2016-06-21 17:16:16 -05:00
Alexander Alekhin
09c2a8b7ad
cmake: fix HAL dependencies for core module
...
Linker dependencies are transitive for non-private
2016-06-21 19:50:32 +03:00
Alexander Alekhin
be38a524a8
Merge pull request #6705 from alalek:fix_hal_imgproc
2016-06-21 16:24:29 +00:00
Matthew Skolaut
7284a77cd3
fix casting warning in python createButton binding
2016-06-20 21:07:24 -05:00
Matthew Skolaut
e8bfb48490
Merge branch 'master' of https://github.com/Itseez/opencv
...
Added python binding for createButton
2016-06-20 16:24:23 -05:00
Matthew Skolaut
9b959072a2
added python binding for createButton
2016-06-20 16:24:15 -05:00
Alexander Alekhin
2fb670cf09
hal: fix missing include "opencv2/imgproc/hal/interface.h"
2016-06-20 19:25:49 +03:00
MYLS
29921d055d
change the parameter to CvMat
and CvMatND
...
```cpp
cvWriteMat_Base64(::cv::FileStorage & fs, ::cv::String const & name,
::cv::Mat const & mat)
```
becomes:
```cpp
CV_EXPORTS void cvWriteMat_Base64(::CvFileStorage* fs, const char* name,
const ::CvMat* mat);
CV_EXPORTS void
cvWriteMatND_Base64(::CvFileStorage* fs, const char* name, const
::CvMatND* mat);
```
2016-06-20 16:59:58 +08:00
MYLS
9faa2a7fd0
solve warning for IOS
...
Two test are still needed:
1. Verify the Base64 data.
2. Read an old YML file for compatibility test.
2016-06-19 02:44:39 +08:00
MYLS
958263d245
Solve warnings, and adjusted the test case.
2016-06-19 02:00:32 +08:00
MYLS
882e4221e7
fix errors from test.
...
Two other test are still needed.
1. Verify the Base64 data.
2. Read an old YML file for compatibility test.
2016-06-19 00:45:51 +08:00
MYLS
d1b097f409
fix most coding style warnings and errors
2016-06-18 23:28:12 +08:00
MYLS
7b1f7c8d8e
Add Base64 support for FileStorage
...
1. Add Base64 support for reading and writing XML\YML file.
The two new functions for writing:
```cpp
void cvWriteRawData_Base64(cv::FileStorage & fs, const void* _data, int
len, const char* dt);
void cvWriteMat_Base64(cv::FileStorage & fs, cv::String const & name,
cv::Mat const & mat);
```
2. Change YML file header form `YAML:1.0` to `YAML 1.0`. (standard
format)
3. Add test for Base64 part.
2016-06-18 22:14:11 +08:00
MYLS
ecd827fc8e
Add Base64 support for FileStorage
...
[GSoC] FileStorage:
Add base64 support for reading and writting XML\YML file.
The two new functions:
```
void cvWriteRawData_Base64(cv::FileStorage & fs, const void* _data, int
len, const char* dt);
void cvWriteMat_Base64(cv::FileStorage & fs, cv::String const & name,
cv::Mat const & mat);
```
2016-06-18 21:40:29 +08:00
Alexander Alekhin
31952fbf1c
Merge pull request #6675 from pnordhus:matconstiterator_reference
2016-06-17 10:12:51 +00:00
Vadim Pisarevsky
547a2d29c3
Merge pull request #6535 from sovrasov:lapack-hal
2016-06-16 20:09:47 +00:00
Vadim Pisarevsky
4142e737b0
Merge pull request #6453 from sovrasov:extend_calibrateCamera
2016-06-16 18:28:49 +00:00
Alexander Alekhin
c3456c0754
Merge pull request #6685 from ioxp:dofDocu
2016-06-15 20:43:11 +00:00
Philipp Hasper
45bd56e28a
rigidTransform: only four DoF
...
combinations of translation, rotation, and uniform scaling equals four degrees of freedom
2016-06-15 16:41:39 +02:00
Alexander Alekhin
f4ebc504d1
cmake: refactor HAL attaching process
2016-06-15 17:34:30 +03:00
Philipp Nordhus
4a529cd641
Return reference on iterator indirection/subscript
2016-06-11 15:17:52 +02:00
Tomoaki Teshima
87d0c91dcf
fix warning of build
2016-06-09 18:24:00 +09:00
Tomoaki Teshima
d0a8390963
fix run time error on Mac
...
* integrate HW version and SW version to same function
2016-06-09 08:41:37 +09:00
Adam Rankin
2577194c70
Correcting return type from videoDevice::findType to be int thus allowing detection of failed device init request
2016-06-07 15:18:40 -04:00
Alexander Alekhin
1b6e02793c
Merge pull request #6645 from tomoaki0705:fixTypoEigen
2016-06-07 13:51:30 +00:00
Tomoaki Teshima
fd76ed5c0f
fix to support wider compiler
...
* check compiler more strictly
* use gcc version of fp16 conversion if it's possible (gcc 4.7 and later)
* use current SW implementation in other cases
2016-06-07 18:32:47 +09:00
Tomoaki Teshima
6f6eebbcb9
fix warning
2016-06-07 18:31:18 +09:00
Vladislav Sovrasov
46fb46c54e
Add an extended version of CalibrateCamera function
2016-06-07 12:31:11 +03:00
Vladislav Sovrasov
055f5c7395
Change names of some internal functions
2016-06-07 10:58:12 +03:00
Tomoaki Teshima
d1c1c01761
fix typo
2016-06-07 14:53:04 +09:00
Tomoaki Teshima
fbfd3158a7
fix corner case when number is small
2016-06-07 08:59:28 +09:00
Maksim Shabunin
532885c12b
Merge pull request #6607 from alalek:issue_6604
2016-06-06 09:20:58 +00:00
Tomoaki Teshima
4239bac4ed
fix warning of doc
...
* update the comment to real header
2016-06-06 18:06:23 +09:00
Tomoaki Teshima
eccf2fa4c3
follow other interface
...
* remove useHW option
* update test
2016-06-06 08:56:37 +09:00
k-shinotsuka
43d5988df6
improve to calculate norm
2016-06-05 16:55:02 +09:00
Suleyman TURKMEN
7c5b981c17
Update drawing.cpp
2016-06-05 01:06:55 +03:00
Vladislav Sovrasov
a2d0cc878c
Implement internal HAL for GEMM and matrix decompositions
2016-06-03 10:38:30 +03:00
Louis Letourneau
c03d778ec7
This fixes the seeking in h264 B-Frame enabled video issue. #4890
2016-06-02 11:24:37 -04:00
Alexander Alekhin
e1ba4399e8
Merge pull request #6611 from tomoaki0705:fixPerformanceSplitAarch64
2016-06-01 10:34:33 +00:00
Tomoaki Teshima
070e4d754e
let the performance test of split pass on 64bit ARM
...
* loosen the threshold only under aarch64
* fix #6610
2016-05-31 23:57:49 +09:00
Alexander Alekhin
d3930cdee1
Merge pull request #6482 from paroj:filestorage_py
2016-05-31 11:53:34 +00:00
Vadim Pisarevsky
a2d8e7fa6e
Merge pull request #6485 from vagran:vagran-patch-1
2016-05-31 10:58:18 +00:00
Vadim Pisarevsky
7f9319924b
Merge pull request #6537 from Slonegg:opeeni2_multiple_devices
2016-05-31 10:35:44 +00:00
Vadim Pisarevsky
40686415f9
Merge pull request #6593 from bramton:documentation-update
2016-05-31 10:32:18 +00:00
Vadim Pisarevsky
904cfa576c
Merge pull request #6597 from sturkmen72:issue_4678
2016-05-31 10:31:15 +00:00
Alexander Alekhin
ff0601cda5
core: prevent changes in 'std' namespace
2016-05-31 13:02:15 +03:00
Alexander Alekhin
f6fa1cee2b
Merge pull request #6008 from amroamroamro:fix_sparse_snippet
2016-05-31 08:19:38 +00:00
Marek Smigielski
ef45005056
Adding support for pointer generation. Fixes #6605
2016-05-31 08:35:50 +02:00
Gilles Rochefort
9e53f03968
Fixed BackgroundSubstractorMOG2 in opencv_video.
...
The number of gaussians involved in a mixture is supposed
to be dynamically adjusted. After being increased, the number
of gaussians can't be reduced anymore.
It seems to be a regression as the legacy code
located in modules/legacy/src/bgfg_gaussmix.cpp allows to reduce
such number of gaussians.
2016-05-29 17:46:33 +02:00
Suleyman TURKMEN
e59da10bf1
Update highgui.hpp
2016-05-28 05:25:25 +03:00
Bram Ton
dfd5191e8b
Minor additions to the documentation.
2016-05-26 16:35:20 +02:00
Alexander Alekhin
4547427946
Merge pull request #6589 from tomoaki0705:fixThresh64fTest
2016-05-26 12:44:56 +00:00
Tomoaki Teshima
bbeac745ca
Update test case for 64F version
2016-05-26 08:38:29 +09:00
Maksim Shabunin
cbf2b79e1f
Fixed documentation warnings produced by updated doxygen
2016-05-25 18:04:32 +03:00
Pavel Rojtberg
bf688da50b
FileStorage: add simplified API for bindings
...
at least it is possible to read/ write calibration files. Fixes #4282 .
Also add CPP method for writing comments.
2016-05-25 16:01:55 +02:00
Vadim Pisarevsky
0cb1e96472
Merge pull request #6546 from atinfinity:pullreq/160517-threshold-64F
2016-05-25 13:19:50 +00:00
Vadim Pisarevsky
0fc26f80d7
Merge pull request #6547 from mshabunin:python-vector-pair-int-double
2016-05-25 13:17:15 +00:00
Maksim Shabunin
a191c043ae
Merge pull request #6573 from dharezlak:patch-1
2016-05-24 15:28:27 +00:00
Maksim Shabunin
64a5126ff8
Merge pull request #6018 from sturkmen72:patch-2
2016-05-23 11:57:26 +00:00
dharezlak
308b47ce58
Improved Java wrapper generation
...
While generating Java JNI wrappers package names with an underscore (`_`) character where not properly escaped according to https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#resolving_native_method_names (see also: https://github.com/Itseez/opencv_contrib/issues/652 ).
This fix replaces all the occurrences of `_` with `_1` resulting in proper JNI method names.
2016-05-23 11:13:18 +02:00
Maksim Shabunin
c393a7a98f
Merge pull request #6564 from jlguardi:ml_load_empty_ptr
2016-05-23 08:41:05 +00:00
Maksim Shabunin
5c54360fb9
Merge pull request #6565 from jlguardi:ann_64f_bug
2016-05-23 08:39:25 +00:00
Tomoaki Teshima
b2ad7cd9c0
add feature to convert FP32(float) to FP16(half)
...
* check compiler support
* check HW support before executing
* add test doing round trip conversion from / to FP32
* treat array correctly if size is not multiple of 4
* add declaration to prevent warning
* make it possible to enable fp16 on 32bit ARM
* let the conversion possible on non-supported HW, too.
* add test using both HW and SW implementation
2016-05-21 21:31:33 +09:00
Suleyman TURKMEN
c6e6d4c822
Update pca.cpp
2016-05-21 14:23:45 +03:00
Suleyman TURKMEN
abab67b574
Update imgproc.hpp
...
update documentation of calcBackProject() calcHist() compareHist()
2016-05-21 14:08:14 +03:00
Alexander Alekhin
b07944df23
Merge pull request #6561 from tomoaki0705:fixMulSpectrumAarch64
2016-05-20 19:39:09 +00:00
Alexander Alekhin
a0a8acadb7
Merge pull request #6559 from OzgrCn:cuda-ORB-useProvidedKeypoints
2016-05-20 19:38:31 +00:00
Jose Luis Guardiola
a812989436
Fixed #6563 : Incorrect management for invalid files/filestorage/filenode in ml module
2016-05-20 13:18:02 +02:00
Jose Luis Guardiola
2bb520e277
Fixed #6562 : Incorrect CV_64F management in ANN
2016-05-20 13:16:59 +02:00
Özgür Can
4951543441
Fix issue #6473
...
Enable "useProvidedKeypoints" flag on cuda::ORB's detectAndCompute function in order to able to describe provided keypoints.
* additional author : Ender Tunç <endertunc@yahoo.com>
resolves #6473
* Enable "useProvidedKeypoints" flag on cuda::ORB's detectAndCompute function in order to able to describe provided keypoints.
Update for using 'const' reference to avoid array copy on each iteration.
resolves #6473
Update for 'const' reference to avoid array copy on each iteration.
2016-05-20 13:19:14 +03:00
Maksim Shabunin
16f4baa3f6
Merge pull request #6498 from berak:python_size_t
2016-05-20 09:45:52 +00:00
Tomoaki Teshima
bfcb40ad77
fix Core_MulSpectrum test on 64bit ARM + release mode
...
* fix issue #6536
* increase threshold in particular tests due to the difference of fmsub and fsub
2016-05-20 18:25:32 +09:00
Han Hu
e646f9d2f1
Fix subpixel problem of akaze.
...
This is found in the original akaze repo. Previous sub pixel localization method assumes the coordinate (0, 0) is the up-left corner of the up-left pixel. But as far as I know, opencv uses the center of the up-left corner, in this case it should be done in this way.
35aeb83a71
db3dc22981
2016-05-20 11:45:46 +08:00
Maksim Shabunin
c3d1f94ee6
Merge pull request #6446 from kevin-coder:bugfix_6445
2016-05-18 09:40:26 +00:00
atinfinity
1f1464c925
remove unnecessary cast
2016-05-18 08:32:29 +09:00
atinfinity
ef0931be44
fixed compilation warning
2016-05-18 00:34:51 +09:00
Maksim Shabunin
8011be2810
Python bindings: added std::vector< std::pair< int, double > > type read support
2016-05-17 17:26:27 +03:00
atinfinity
6930325847
Added test case of cv::threshold(CV_64F)
2016-05-17 22:57:05 +09:00
atinfinity
e4f207c4b4
Changed cv::threshold() to support CV_64F
2016-05-17 22:56:03 +09:00
Tomoaki Teshima
b6a093fba1
accept multiple channels image for threshold on cuda
...
* modify test, too
2016-05-16 06:45:35 +09:00
Maksim Shabunin
925d8c1dec
Merge pull request #6522 from tomoaki0705:fixVSqrtAarch64
2016-05-13 09:00:12 +00:00
Dmitry Trifonov
688ebd8960
add support for multiple OpenNI2 devices
2016-05-12 18:12:51 -07:00
Tomoaki Teshima
7077d1de63
fix hal_intrin test on 64bit ARM
...
* fix issue 6521
* use correct comparison
2016-05-12 18:30:09 +09:00
Alexander Alekhin
72ec643129
Merge pull request #6483 from StevenEWright:patch-1
2016-05-11 10:41:09 +00:00
Vladislav Vinogradov
10896129b3
GraphCut deprecated in CUDA 7.5 and removed in 8.0
2016-05-06 11:37:32 +03:00
berak
11e563fd5d
python: support for size_t args (default value)
2016-05-03 09:50:08 +02:00
Julien Nabet
a29c814bd8
cppcheck: fix some reports
...
All of these: (performance) Prefer prefix ++/-- operators for non-primitive types.
[modules/calib3d/src/fundam.cpp:1049] -> [modules/calib3d/src/fundam.cpp:1049]: (style) Same expression on both sides of '&&'.
2016-04-29 15:41:39 +02:00
Artyom Lebedev
8ceac4b73b
Update fisheye.cpp
...
Fix for inconsistent asserts in cv::fisheye::initUndistortRectifyMap() which prevents from passing empty matrices in debug build (which is allowed according to the code bellow the asserts and the docs).
2016-04-28 12:50:09 +03:00
Steven E Wright
39f7eccdb0
Fixes minor typos.
2016-04-27 18:02:49 -07:00
Pavel Rojtberg
8ed1945ccd
calibrationMatrixValues: consider principalPoint in FOV computation
...
The FOV depends on the principal point location. Use formula of
viz::Camera.
2016-04-27 14:47:52 +02:00
Pavel Rojtberg
86959310f9
calibrationMatrixValues: bind C++ function in C instead of vice versa
2016-04-27 11:39:19 +02:00
Alexander Alekhin
6e5e5d87df
Merge pull request #6448 from alalek:merge-2.4
2016-04-25 16:56:51 +00:00
Vadim Pisarevsky
df6eb101e1
Merge pull request #6467 from ohnozzy:Doc-for-ocl-Kernel-Run
2016-04-25 13:07:34 +00:00
Vadim Pisarevsky
e587721d1c
Merge pull request #6422 from iclemens:master
2016-04-25 13:06:42 +00:00
Vadim Pisarevsky
8cfddcfeb7
Merge pull request #6454 from paroj:fisheye_py
2016-04-25 12:54:44 +00:00
Vadim Pisarevsky
681fd7f214
Merge pull request #6455 from belgraviton:bugfix_5953
2016-04-25 12:50:45 +00:00
Vadim Pisarevsky
f4e00bd60f
Merge pull request #6463 from ohnozzy:ocl-linearpolar-and-logpolar
2016-04-25 12:42:40 +00:00
Vadim Pisarevsky
904381c602
Merge pull request #6020 from mshabunin:hal_dxt
2016-04-25 11:37:18 +00:00
Pavel Rojtberg
ccadad4222
fisheye: allow using transposed image and object point arrays
2016-04-25 11:16:26 +02:00
Pavel Rojtberg
8d4cebe077
fisheye: create rvecs, tvecs before writing
2016-04-25 11:16:26 +02:00
ohnozzy
d66ed313cb
Add Comment
...
Add documentation for Kernel::run
2016-04-25 11:30:12 +08:00
ohnozzy
db9f611767
Add OpenCL support to linearPolar & logPolar
...
Add OpenCL support to linearPolar & logPolar.
The OpenCL code use float instead of double, so that it does not require
cl_khr_fp64 extension, with slight precision lost.
Add explicit conversion
Add explicit conversion from double to float to eliminate warning during
compilation.
2016-04-24 08:37:56 +08:00
Vadzim Piatrou
43f854bc5f
fixing CLAHE crash with pixels value > 12 bit
2016-04-22 18:55:22 +03:00
Alexander Alekhin
67a734ce73
Merge branch '2.4' into master
...
Commits:
67fe57a
add fixed video
db0ae2c
Restore 2.4 source branch for bug fix 6317.
97ac59c
Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d
Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7
fix bug on border at pyrUp
2016-04-21 20:15:08 +03:00
Zhenqing, Hu
94a9e16943
Fix bug 6445
...
Root cause: when calling imread to read the pgm file, when returning with success reading file, the destructor will free the resource which used by memcpy, but in the code, the resource calculation was not correct, therefore, it will cause memory corruption during resource free.
2016-04-21 14:39:55 +08:00
Alexander Smorkalov
6084901610
OpenCV version++.
2016-04-20 16:03:47 +03:00
Maksim Shabunin
ec63343f34
Merge pull request #6420 from ioxp:foreachDoc
2016-04-20 11:55:03 +00:00
Thomas Schenker
76ced14b3b
fix typo
2016-04-19 15:09:27 +02:00
Maksim Shabunin
5a938309c1
More compilation warnings fixed
2016-04-19 16:08:48 +03:00
Maksim Shabunin
11378fcb17
Fixed compiation problems
2016-04-19 14:50:07 +03:00
Kevin, Hu
db0ae2ca50
Restore 2.4 source branch for bug fix 6317.
2016-04-19 19:27:42 +08:00
Alexander Alekhin
289b6ff2a5
Merge pull request #6393 from paroj:v4l_exposure
2016-04-18 15:14:21 +00:00
Alexander Alekhin
9e9165c25e
Merge pull request #5516 from AVshokurov:master
2016-04-18 15:13:14 +00:00
Maksim Shabunin
5e9192287d
Added HAL cvtColor interface
2016-04-18 16:34:25 +03:00
Alexander Alekhin
96937bac74
Merge pull request #6581 from mshabunin:hal_mag
2016-06-21 13:16:17 +00:00
Maksim Shabunin
1e667de1f3
HAL math interfaces: fastAtan2, magnitude, sqrt, invSqrt, log, exp
2016-05-31 11:54:52 +03:00
Ivar Clemens
3287ab386c
Fixed typo in BRISK feature detector.
2016-04-18 13:04:04 +01:00
Alexander Alekhin
d02f17c39d
Merge pull request #6397 from ioxp:androidCamLog
2016-04-18 11:56:18 +00:00
Suleyman TURKMEN
194f1beae8
fix for writing 16-bit jpeg2000
2016-04-18 14:51:55 +03:00
Philipp Hasper
c52759432d
Fixing doc for cv::Mat::forEach
...
image.forEachWithPosition does not exist
2016-04-18 13:51:07 +02:00
Alexander Alekhin
68b7323b4e
Merge pull request #6417 from sturkmen72:patch-14
2016-04-18 10:35:28 +00:00
Alexander Alekhin
c02d89bf2d
Merge pull request #6408 from dtmoodie:InputOutputArray_constructor_fix
2016-04-18 10:34:43 +00:00
Alexander Alekhin
a513f482c0
Merge pull request #6406 from ohnozzy:Bug-Fix-for-Issue-6377
2016-04-18 10:29:29 +00:00
Maksim Shabunin
809c159e11
Merge pull request #6414 from mshabunin:fix-macosx-warnings
2016-04-17 22:11:57 +00:00
Maksim Shabunin
ba3b1de93f
Updates for XCode 7.3
2016-04-17 20:21:29 +03:00
Alexander Alekhin
169b5e9fde
Merge pull request #6359 from alalek:videocapture_exceptions
2016-04-17 09:30:43 +00:00
Suleyman TURKMEN
98239664f6
fix for writing 16-bit jpeg2000
2016-04-17 00:37:28 +03:00
Dan
e9461d3feb
templated std::vector<T> constructor was being called instead of const std::vector<cv::cuda::GpuMat>.
2016-04-14 15:50:24 -04:00
Alexander Alekhin
0df901b389
Merge pull request #6404 from solosuper:bugfix/issue6315
2016-04-14 14:27:59 +00:00
Alexander Alekhin
ccff20328d
Merge pull request #6407 from StevenPuttemans:fix_ts_perf_warnings
2016-04-14 14:27:27 +00:00
StevenPuttemans
88c0d64b4e
fixing gstreamer cap
2016-04-14 14:16:05 +02:00
StevenPuttemans
c34bb0ed03
remove warnings generated during TS module tests
2016-04-14 13:48:11 +02:00
ohnozzy
9be6b4f2d1
Bug Fix for 6377
...
Rewrite linearPolar & logPolar so that they do not depend on the
deprecated API CvMat. Issue 6377 is resolved in this way because the two
routines do not convert UMat to CvMat anymore.
2016-04-14 19:39:02 +08:00
solosuper
372890f1d7
fix #6315
2016-04-14 11:57:49 +02:00
Alexander Alekhin
5b73f3a316
Merge pull request #6373 from terfendail:vt/stereobm_valgrind
2016-04-13 13:38:53 +00:00
Maksim Shabunin
ed508dc8ed
Merge pull request #6399 from mshabunin:fix-flann-memleak
2016-04-13 11:34:58 +00:00
Alexander Alekhin
fc55e54aa1
Merge pull request #6318 from paroj:gst_cap_props
2016-04-13 10:05:40 +00:00
Maksim Shabunin
b99d010977
Fixed memory leak in flann KMeansIndex
2016-04-13 12:08:42 +03:00
Maksim Shabunin
49b4af1e5c
Merge pull request #6395 from Tauranis:master
2016-04-13 07:53:33 +00:00
Maksim Shabunin
d8629b0fa4
Merge pull request #6335 from themightyoarfish:canny_kernel_sz_fix
2016-04-13 07:52:05 +00:00
Maksim Shabunin
fc9f7cc925
Merge pull request #6375 from ohnozzy:Bug-Fix-for-Issue-6288
2016-04-13 07:51:33 +00:00
Philipp Hasper
cc7a1a2ab7
Deactivated two noisy camera-retrieval log messages in android
...
They were issued for every frame retrieved - even in a release build.
2016-04-13 09:17:33 +02:00
Tauranis
edb6a0e889
Bug fix for MLP predict for small values to avoid nan responses.
2016-04-12 15:59:32 -03:00
Alexander Alekhin
9744073b95
videoio: give chance for all enabled backends
...
"Eat" unexpected backend exceptions
2016-04-12 20:05:21 +03:00
Maksim Shabunin
8f6e102331
Merge pull request #6345 from eduardohenriquearnold:master
2016-04-12 15:22:32 +00:00
Vitaly Tuzov
13858cd561
Cost estimation boundaries description updated
2016-04-12 17:31:12 +03:00
Vitaly Tuzov
772d9689e9
Backport of StereoBM uninitialized memory access problem fix from master branch
2016-04-12 17:27:16 +03:00
ohnozzy
9dd962ca1a
Bug Fix for Issue 6288
...
Added 2 inline functions in persistence.hpp
So that the '>>' operator works correctly for std::Vector<KeyPoint> and
std::Vector<DMatch>
2016-04-12 21:40:50 +08:00
Maksim Shabunin
1307bb1d03
Merge pull request #6314 from mvukad:bugfix_dtreeswrite
2016-04-12 13:26:25 +00:00
Alexander Alekhin
2b29db860c
Merge pull request #6391 from virtuald:v4l-device-name
2016-04-12 12:57:21 +00:00
Pavel Rojtberg
91678ff828
cap_v4l: allow manually controlling exposure
2016-04-12 12:10:54 +02:00
Maksim Shabunin
ff3bb9f4e6
Merge pull request #6383 from alalek:backport_6381
2016-04-12 08:40:01 +00:00
Dustin Spicuzza
e489f29d0f
v4l/libv4l: allow opening device by name
...
- Allows using non-default device names such as /dev/v4l/by-path/pci-0000:00:1d.0-usb-0:1.1:1.0-video-index0
2016-04-12 01:25:34 -04:00
Maksim Shabunin
70bc268c1a
Fixed problem with nonfree python test: could not find local test images
2016-04-11 18:45:14 +03:00
Andreas Franek
1b3a967223
Enable directly writing jpeg-encoded streams with GStreamer
...
CvVideoWriter_GStreamer assumes a JPEG encoded stream if the height of
the given frame size is 1.
2016-04-11 17:10:57 +02:00
Philipp Hasper
b6d8c9d990
operator<< handles keys starting with underscore
2016-04-11 12:43:58 +03:00
Philipp Hasper
47c4ee974a
operator<< handles keys starting with underscore
2016-04-11 09:55:33 +02:00
Maksim Shabunin
233612efd7
Reworked HAL dft/dct interface, added replacement documentation
2016-04-08 16:03:51 +03:00
Maksim Shabunin
f40d701427
DFT: renamed HAL functions
2016-04-08 11:19:28 +03:00
Maksim Shabunin
15783cf668
Always use hal::dft in crossCorr function
2016-04-08 11:19:28 +03:00
Maksim Shabunin
008abd28fd
Extracted HAL interfaces for DFT/DCT, added new test
2016-04-08 11:19:28 +03:00
Vitaly Tuzov
a7ce9a176b
Fixed uninitialized memory errors in stereoBM
2016-04-07 23:58:17 +03:00
mvukad
695e33b25b
Fix missing format when writing Algorithm-based objects
...
Added a writeFormat() method to Algorithm which must be called by the
write() method of derived classes.
2016-04-07 13:49:42 -07:00
Maksim Shabunin
5877debb6f
HAL resize, warpAffine, warpPerspective interface
...
- added HAL documentation support
- added documentation to HAL replacement interface
- updated several HAL functions in imgproc module
2016-04-07 18:47:24 +03:00
shengyu
2d41321ca0
fix quote
2016-04-06 14:31:06 +08:00
Alexander Alekhin
52ba3778e3
Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24
2016-04-05 16:29:15 +00:00
Alexander Alekhin
1f7fea9092
Merge pull request #6244 from dreifachstein:topic-cmake-install
2016-04-05 15:23:55 +00:00
Vitaly Tuzov
34b3d31f54
Fix for nonlocal data requirement in test2.py
2016-04-05 16:47:29 +03:00
Alexander Alekhin
6f139b4f8e
ffmpeg: interrupt callback fix
...
backport from master
2016-04-05 14:19:44 +03:00
Alexander Alekhin
7d9a480597
ffmpeg: interrupt callback fix
2016-04-04 13:17:04 +03:00
Vadim Pisarevsky
46d218bcec
Merge pull request #6312 from KnockSoftware:split-float-epsilon
2016-04-03 23:10:10 +00:00
Maksim Shabunin
0c068768a5
Merge pull request #6351 from mshabunin:fix_java_moments
2016-04-01 09:19:09 +00:00
shengyu
21513caf3f
missing right quote
2016-04-01 11:03:50 +08:00
Alexander Alekhin
873884aa47
Merge pull request #6346 from filipsladek:box_filter_32FC1
2016-03-31 17:06:52 +00:00
Alexander Alekhin
ab3fb8b2f8
Merge pull request #6340 from BloodAxe:parallel_logistic_regression
2016-03-31 17:06:20 +00:00
Maksim Shabunin
a5af69de6a
Java wrapper for moments: do not truncate values in set method
2016-03-31 12:57:10 +03:00
filipsladek
a821fde44e
add performance test for CV_32FC1
2016-03-31 09:05:02 +02:00
Alexander Alekhin
a056c9b113
Merge pull request #6329 from paroj:window_gui_cpp
2016-03-30 14:34:55 +00:00
filipsladek
f635381662
add testcase for CV_32FC1
2016-03-30 10:38:22 +02:00
filipsladek
493ac1df37
code style
2016-03-29 22:44:03 +02:00
filipsladek
9c3f790edb
Box filter implemented for CV_32FC1
2016-03-29 22:30:49 +02:00
Eduardo Arnold
d046602ea4
Enforced DecisionFunction vector indexes to be saved on SVM save/load methods
2016-03-29 16:35:27 -03:00
Vitaly Tuzov
64f02aa72d
Backport of setRNGSeed implementation and python test randomness fix
2016-03-29 18:05:28 +03:00
Alexander Alekhin
ff0d115800
Merge pull request #6332 from sovrasov:python_rng_seed
2016-03-29 14:23:26 +00:00
Roman Donchenko
97ac59cb73
Fix a memory leak indirectly caused by cvDestroyWindow
2016-03-29 14:06:05 +03:00
Eugene Khvedchenya
ee92a36123
Added parallel implementation of compute_gradient method.
2016-03-29 11:09:54 +03:00
Vladislav Sovrasov
72ed4173df
Change setRNGSeed implementaion
2016-03-29 10:54:42 +03:00
Evan Heidtmann
0712bccf52
Fix epsilon comparison when splitting
2016-03-28 14:16:32 -07:00
Прун Виктор
93ff1fb2f2
Correct image borders and principal point computation in cv::stereoRectify
2016-03-28 15:59:18 +03:00
themightyoarfish
68d97502fe
Error message for wrong kernel size was insufficient.
...
When setting a wrong kernel size, the error message only tells the user that it
must be odd, however the conditions for rejection include values > 7 which must
be communicated. Without that, the message would be incorrect and confusing if
the user is unaware that only values 3, 5, 7 are accepted.
2016-03-28 14:06:55 +02:00
Alexander Alekhin
ee123b8a9e
Merge pull request #6311 from peters:master
2016-03-26 19:55:17 +00:00
Vladislav Sovrasov
362d52a3cb
Fix doxygen warnings
2016-03-25 16:34:45 +03:00
Vladislav Sovrasov
a490b64e9b
Add function setRNGSeed and seed setup in python tests
2016-03-25 16:17:58 +03:00
Alexander Alekhin
05384f05cc
Merge pull request #6313 from amannababanana:master
2016-03-25 11:31:17 +00:00
Pavel Rojtberg
0ac31a0bd7
highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings
2016-03-24 23:58:47 +01:00
Vitaly Tuzov
ea3746bd15
Made texture flow python test less strict to fix it on AARCH64
2016-03-23 20:07:42 +03:00
Pavel Rojtberg
9dc14b3efc
cap_gst: inspect sink instead of videoconvert to find out properties
...
videoconvert might not be present on a manual pipeline, but appsink must
be.
2016-03-23 16:24:10 +01:00
Vadim Pisarevsky
e792ee89de
Merge pull request #6243 from mshabunin:hal_morph
2016-03-23 13:09:19 +00:00
Vadim Pisarevsky
e547916e88
Merge pull request #6285 from sovrasov:python_tests_cleanup
2016-03-23 13:07:00 +00:00
Lucas Solomon
d2d5d32fe0
remove trailing whitespace
2016-03-22 22:31:16 -07:00
Lucas Solomon
688b4d9d7a
return 0 from VideoCapture::read() when cannot connect to camera
2016-03-22 19:03:28 -07:00
Peter Rekdal Sunde
278747ba45
Add support for ffmpeg 3.0.
2016-03-22 22:52:35 +01:00
Maksim Shabunin
f3127521f3
Merge pull request #6214 from vonnieda:java_features2d
2016-03-21 11:51:11 +00:00
Alexander Alekhin
a4e35d83ff
Merge pull request #6267 from dtmoodie:issue_5918
2016-03-21 09:37:11 +00:00
Maksim Shabunin
3b6190dfad
Merge pull request #6150 from lvv:fix-6149-applColorMap
2016-03-21 09:20:52 +00:00
Maksim Shabunin
83379695a0
HAL interface for morphology operations
2016-03-21 09:32:06 +03:00
Leonid Volnitsky
bebab8d647
fix: 6149 (through CV_Error on wrong image type)
2016-03-19 19:57:05 +02:00
Xiaolei Yu
40eb613bbf
Make install paths relative to CMAKE_INSTALL_PREFIX
2016-03-19 16:41:51 +08:00
Vitaly Tuzov
24361733e4
Fixed face detection python test
2016-03-18 17:44:45 +03:00
Alexander Alekhin
4e479d58f8
Merge pull request #6290 from dtmoodie:thrust_allocator_usage_pr
2016-03-18 12:14:20 +00:00
Vladislav Sovrasov
fd61978795
Add goodfeatures python test and cleanup in test directory
2016-03-18 11:16:08 +03:00
Dan
da189ce1e0
Fixed regression in cv::VideoCapture with gstreamer back end that prevented viewing of rtsp streams.
2016-03-17 13:03:48 -04:00
Alexander Smorkalov
b8ce65bec8
Merge pull request #6279 from terfendail:vt/pythontest_data
2016-03-17 12:27:12 +00:00
Alexander Alekhin
2f4e38c831
Merge pull request #6283 from jlubawy:vfw-surface4-fix
2016-03-17 11:08:12 +00:00
Vitaly Tuzov
96903dc4ad
Test data necessary for python samples added to test package.
...
Test launch script updated to run new tests as well.
2016-03-17 11:38:40 +03:00
Josh Lubawy
1bd8bcbdd9
Remove cstdio debug
2016-03-17 01:00:49 -07:00
Josh Lubawy
f715e5b0b2
Add support for YUV 4:2:0 NV12 frame format in VFW camera capture
2016-03-16 23:38:17 -07:00
Roman Donchenko
eb40afa26a
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
...
I delete the LIBAVFORMAT_BUILD < 5231 branch, because I couldn't even find FFmpeg with
such a small build number, let alone test with it.
2016-03-16 20:04:33 +03:00
Roman Donchenko
421fcf9e35
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
2016-03-16 16:28:59 +03:00
Robbert Klarenbeek
81b11ee463
Replace deprecated malloc.h
2016-03-16 11:37:27 +01:00
Roman Donchenko
9a5d7f1a0b
Backport PR #3813 to 2.4
...
It has already been partially backported by #6199 ; this commit completes
the backport.
2016-03-16 12:34:41 +03:00
Robbert Klarenbeek
dd510e1de9
Fix incompatibility with some C++11 implementations
2016-03-15 17:21:05 +01:00
Dan
1d21493302
Merge branch 'issue_6251' of http://github.com/dtmoodie/opencv into thrust_allocator_usage_pr
2016-03-15 11:18:41 -04:00
Dan
a21ede9452
Thrust allocator usage.
2016-03-15 11:14:47 -04:00
Dan
7a934f9ee0
Compatibility and bug fixes.
2016-03-15 11:14:42 -04:00
Dan
a8ca560684
Fixed more missing async calls.
2016-03-15 11:14:42 -04:00
Dan
79ecefb51f
Implemented async calls.
2016-03-15 11:14:41 -04:00
Zhigang Gong
0b08d2559e
fix potential race condition in canny.cl.
...
See the below code snippet:
while(l_counter != 0)
{
int mod = l_counter % LOCAL_TOTAL;
int pix_per_thr = l_counter / LOCAL_TOTAL + ((lid < mod) ? 1 : 0);
for (int i = 0; i < pix_per_thr; ++i)
{
int index = atomic_dec(&l_counter) - 1;
....
}
....
barrier(CLK_LOCAL_MEM_FENCE);
}
If we don't put a barrier before the for loop, then there is a possiblity
that some work item enter this loop but the others are not, the the l_counter
will be reduced in the for loop and may be changed to zero, and the other
work items may can't enter the while loop. If this happens, it breaks the
barrier's rule which requires all the work items reach the same barrier.
And it may hang the GPU depends on the implementation of opencl platform.
This issue is raised at:
https://github.com/Itseez/opencv/issues/5175
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
2016-03-15 19:11:15 +08:00
Dan
42c36c0c80
Linux bug fix for ThrustAllocator.
2016-03-14 11:09:52 -04:00
Alexander Alekhin
7783206934
Merge pull request #6259 from polevoy-d-v:move_sematics_fix
2016-03-14 14:46:21 +00:00
Прун Виктор
a90a576d76
fixed incorrect behaviour of move semantics for cv::Ptr, cv::Mat, cv::UMat in case when rvalue-reference references to *this.
2016-03-14 16:10:23 +03:00
Alexander Alekhin
708761b219
Merge pull request #6253 from berak:patch-1
2016-03-14 11:27:11 +00:00
Alexander Alekhin
4f9e1a9a58
Merge pull request #6249 from sturkmen72:patch-15
2016-03-14 11:26:51 +00:00
Alexander Alekhin
9d49cef29e
Merge pull request #6245 from delftswa2016:fix-for-issue-4375
2016-03-14 11:26:33 +00:00
Alexander Alekhin
cc3433f349
Merge pull request #6045 from matthieu-ft:master
2016-03-14 11:25:23 +00:00
berak
4555f9ac25
svmsgd.cpp, fix #6248
...
add a cast to double, to make vs compilers happy
2016-03-14 08:02:09 +01:00
Suleyman TURKMEN
826b5a2ef1
Update lda.cpp
...
typo correction
2016-03-13 21:11:34 +02:00
shruthikashyap
1fbc6ab05d
Adding the syntax and usage for cv2.undistortPoints().
2016-03-13 13:32:24 +01:00
Vadim Pisarevsky
fbc221d334
Merge pull request #6096 from mnoskova:mn/SVMSGD_to_opencv3_0
2016-03-12 17:16:35 +00:00
Vadim Pisarevsky
cd1426ba8d
Merge pull request #6025 from sovrasov:new_python_tests
2016-03-12 17:11:19 +00:00
Vadim Pisarevsky
c186f424c5
Merge pull request #6119 from mshabunin:hal_filter2d
2016-03-12 17:08:10 +00:00
Vadim Pisarevsky
c9db05de22
Merge pull request #6137 from dtmoodie:thrust_allocator
2016-03-12 17:07:03 +00:00
Vadim Pisarevsky
bad09e5f58
Merge pull request #6206 from alalek:polar_fix
2016-03-12 16:40:35 +00:00
Balint Cristian
f819323296
Fix AGAST keypoint declared size.
2016-03-12 16:49:14 +02:00
Alexander Alekhin
c41dc915fd
Merge pull request #6232 from piotr-semenov:semenovp_fixes
2016-03-11 12:23:41 +00:00
Piotr Semenov
00e91fd3d0
Fix that corrects the OpenCV's random access iterator distance: d(x,y) = -d(y,x)
2016-03-11 15:20:36 +03:00
Alexander Alekhin
bcca213b88
Merge pull request #6224 from alalek:fix_java_binary
2016-03-10 17:03:43 +00:00
Maksim Shabunin
3afb5a6006
Merge pull request #6171 from terfendail:vt/new_python_tests_backport
2016-03-10 09:09:32 +00:00
Piotr Semenov
108ddc199a
Fix that corrects the OpenCV's random access iterator distance: d(x,y) = -d(y,x)
2016-03-10 11:58:32 +03:00
WANG Guoqin
8cfc87cf01
MacOSX / QTKit capture: trying to fix invalid timer call
2016-03-10 02:49:10 +08:00
Alexander Alekhin
cbd0ee21d5
revert: java bindings become CMake modules (loadable plugins)
...
This reverts part of commit 0db10a3052
2016-03-09 12:13:46 +03:00
Vladislav Sovrasov
e2434ab7c3
Use AKAZE detector instead of ORB in feature_homography test
2016-03-09 11:37:25 +03:00
Matthieu FT
78475a47a5
fix: bg substraction for float images with OpenCL
2016-03-07 16:23:05 +01:00
Krishnaraj Bhat
9b8013d193
gcc6: fix misleading indentation warning
...
cosmetic changes to fix this warning.
real bugs not found
2016-03-07 17:06:16 +05:30
Jason von Nieda
f4b502dd03
Adds supports for the majority of features2d to the Java wrappers:
...
* Adds the main features2d header to the parse list for the generator.
* Removes the manual definition of drawKeypoints and drawMatches since these are now included in the main header.
* Updates the generator to ignore SimpleBlobDetector, FlannBasedMatcher and DescriptorMatcher as these cause conflicts with the generator. This is okay since these were not previously included in the distribution anyway, so no harm is done.
2016-03-07 00:14:53 -08:00
Alexander Alekhin
ec66a3700f
logPolar/linearPolar: more accurate processing near zero angle slice
2016-03-03 19:08:08 +03:00
Maksim Shabunin
98fff4a601
Added separate hal::SepFilter2D class
2016-03-03 18:56:12 +03:00
Maksim Shabunin
17cd1dac06
HAL Filter2D interface: Updated according to comments
2016-03-03 18:56:12 +03:00
Maksim Shabunin
85b2c2ae58
Fixed build with older standalone IPP versions
2016-03-03 18:56:12 +03:00
Maksim Shabunin
8414c6518f
Fixed build with older ippicv
2016-03-03 18:56:12 +03:00
Maksim Shabunin
27abd4d3a3
Filter2D HAL interface
2016-03-03 18:56:12 +03:00
Alexander Alekhin
275bfcf99c
fix logPolar/linearPolar
2016-03-03 18:33:11 +03:00
aravind
dccbf50059
Fixed VS 2010 and option Za bug.
2016-03-03 18:01:05 +05:30
Alexander Alekhin
88a33a4e4f
Merge pull request #6201 from paroj:gst_noconvert
2016-03-03 11:36:05 +00:00
Vitaly Tuzov
d29eb2938c
Calibration test temporary disabled
2016-03-03 13:38:08 +03:00
Vladislav Sovrasov
22b028b64b
Fix warnings in python3
2016-03-03 11:06:21 +03:00
Vladislav Sovrasov
e4fed417d2
Add segmentation and object tracking python tests
2016-03-03 11:06:21 +03:00
Vladislav Sovrasov
0c6e09f060
Changes in facedetect test
2016-03-03 11:06:21 +03:00
Vladislav Sovrasov
87fc75c6d7
Improvements in tests, bugfix in digits_video sample
2016-03-03 11:06:21 +03:00
Vladislav Sovrasov
4e3a6328ba
Fixes in calibration and camshift tests
2016-03-03 11:06:21 +03:00
Vladislav Sovrasov
54c07ba0ff
Add 2 new tests, bugfixed in old tests
2016-03-03 11:06:21 +03:00
Vladislav Sovrasov
cb7cc81653
Add dft python test, fix platform depended result in morphology test
2016-03-03 11:06:21 +03:00
Vladislav Sovrasov
aaa43dc84f
Add morphology python test, fix python3 compabtibility in kmeans test
2016-03-03 11:06:20 +03:00
Vladislav Sovrasov
56571561b4
Add k-means python test, fix loading images in calibration test
2016-03-03 11:06:20 +03:00
Vladislav Sovrasov
5625d79508
Fix loading images in python tests
2016-03-03 11:06:20 +03:00
Vladislav Sovrasov
ab4d375349
Add new tests on python
2016-03-03 11:06:20 +03:00
Pavel Rojtberg
ff77f4d9ef
GStreamer: allow reading raw MJPEG data
2016-03-02 17:31:20 +01:00
Alexander Alekhin
a61b19b524
backport ffmpeg fixes
2016-03-02 18:42:53 +03:00
Alexander Alekhin
bc6ed1467b
Merge pull request #6193 from trombipeti:Fix_#6192
2016-03-02 15:19:01 +00:00
Vadim Pisarevsky
7f4a1bcac7
Merge pull request #6160 from paroj:fe_distort
2016-03-02 13:34:32 +00:00
Vadim Pisarevsky
77f54e0f3e
Merge pull request #6161 from mshabunin:fix-mac-sliders
2016-03-02 13:33:45 +00:00
Elad Joseph
238b47dfce
Added param documentation
...
Added param description to remove doxygen warning
2016-03-02 08:55:53 +02:00
Elad Joseph
2234016a22
Added Subdiv2D class documentation
...
Added documentation to the Subdiv2D documentation, based on the previous
C API.
2016-03-01 23:08:48 +02:00
Péter Trombitás
410eb30c26
Fix for #6192 (Mismatching delete)
2016-03-01 21:40:05 +01:00
Alexander Alekhin
318671d9b5
Merge pull request #6148 from Aravind-Suresh:cv-cuda-reduce-bug-fix
2016-02-29 19:07:05 +00:00
aravind
f4f1561781
Fixed cv::cuda::reduce bug.
2016-02-27 08:30:10 +05:30
Alexander Alekhin
d2e5f90f32
cmake: fix cv2.lib conflict for python2/3 bindings (MSVS)
2016-02-26 17:08:07 +03:00
Marina Noskova
3f0a51bda1
Fixed documentation.
2016-02-26 14:40:23 +03:00
Vitaly Tuzov
25b4d8a1b5
Added images necessary for tests
2016-02-26 12:42:35 +03:00
Vitaly Tuzov
aaa30dc5b6
Make some tests less strict due to improvement of related algorithms in master branch
2016-02-26 12:42:35 +03:00
Vitaly Tuzov
e0f426f78b
Backport of new python tests from master branch(PR https://github.com/Itseez/opencv/pull/6025 ).
...
At the moment tests requre samples/data copied to source location from master branch.
2016-02-26 12:42:18 +03:00
Marina Noskova
53711ec29d
Deleted default value for parameters in docs.
...
Added some asserts.
2016-02-25 19:12:54 +03:00
Marina Noskova
d484893839
Deleted functions makeTrainData() and makeTestData() in test_svmsgd.cpp.
...
Added function makeData() in test_svmsgd.cpp.
2016-02-25 16:57:03 +03:00
Marina Noskova
74c87a26a5
Delete function areClassesEmpty().
2016-02-25 15:31:07 +03:00
Alexander Alekhin
81f21e6e6c
Merge pull request #6139 from ioxp:master
2016-02-25 11:41:49 +00:00
Maksim Shabunin
3a92371b60
EXIF reader: fixed file descriptor leak in case of broken tags
2016-02-25 12:19:11 +03:00
Maksim Shabunin
3cc234588a
Added build warnings in case of macro definition conflicts
2016-02-25 11:51:02 +03:00
Maksim Shabunin
ee2f8d006f
Cocoa backend: added checks before accessing sliders dictionary
2016-02-25 11:51:01 +03:00
Pavel Rojtberg
bb605279b6
clarify how to use fisheye::distortPoints
2016-02-24 16:18:13 +01:00
Marina Noskova
068677ad50
Fixed documentation.
2016-02-24 14:41:51 +03:00
Marina Noskova
9d9a5bbbfd
Fixed documentation.
2016-02-24 13:33:43 +03:00
Marina Noskova
f3c4a6aab8
Rename parameters lambda, gamma0 and c.
2016-02-24 13:22:07 +03:00
Dan
95608b1b84
free -> deallocate
2016-02-18 15:05:13 -05:00
aravind
7ad849718c
Fixed Fisheye Camera model documentation.
2016-02-19 01:17:39 +05:30
Philipp Hasper
3f1eeba39d
findHomography sets output mask to all zeros in case of no inlier
2016-02-18 17:58:28 +01:00
Dan
c0e34934c8
Merge branch 'thrust_allocator' of https://github.com/dtmoodie/opencv
2016-02-18 00:43:18 -05:00
Dan
da93a5527d
Thrust allocator for temporary storage used with thrust algorithms.
2016-02-18 00:23:20 -05:00
Marian Zajko
e55a053d71
ximea new param
...
- added CAP_PROP_XI_SENSOR_BOARD_TEMP parameter
- added acquisition resetting for paramters that require it
2016-02-17 11:18:49 +01:00
Alexander Alekhin
2549bafe4f
Merge pull request #6121 from mshabunin:fix-check-imencode-exif
2016-02-17 00:45:49 +00:00
Maksim Shabunin
03d6d2041a
Merge pull request #6113 from rahulchhabra07:patch-1
2016-02-16 09:04:38 +00:00
Maksim Shabunin
a54870aace
Added filename emptyness check to the Exif reader, fixes 6120
2016-02-16 11:37:36 +03:00
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
Josep Bosch
5384a2205a
Adapted estimateNewCameraMatrix to make it work with pincushion-like distortion.
2016-02-11 11:27:43 +01: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
Mathieu Barnachon
6a0d3b3e42
Called after setDevice.
...
Wrap in a cudaSafeCall.
2016-02-09 14:40:09 +01: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
Nikolay Polyarniy
46e08d34dd
T-API python support implemented:
...
- cv2.UMat implemented - python thin wrapper for UMat
- no implicit copy from GPU to Host done, resulting UMat can be passed to next function without overhead
- cv2.UMat.get() - to fetch data to Host
- new tests covers: ORB, BFMatcher, goodFeaturesToTrack, calcOpticalFlowPyrLK
2016-02-09 12:33:07 +03: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
Mathieu Barnachon
b030ac0433
Ensure the Cuda context is initialized correctly as long as the setDevice is not called in a multi-thread environment.
2016-02-08 13:17:08 +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
alcinos
e22b838af8
Wrap SparseOptFlow class around PyrLK optical flow computation
2016-01-29 01:47:51 +01:00
alcinos
9b70c44f00
Adding interface for Sparse flow computation
2016-01-28 20:03:28 +01:00
alcinos
6e3b90de9b
Add static creator for TVL1 optical flow class
2016-01-28 20:03:28 +01:00
alcinos
be4312ec3d
Wrap DenseOptFlow class around Farneback optical flow computation
2016-01-28 20:03:27 +01: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
Amro
c35b00a97e
fix code snippet showing how to use SparseMat
...
generate indices within the size limit (modulo)
2016-01-23 17:28:49 +02: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
thierry
bdb9cf4d47
fix inversed grayscale conditional
2016-01-18 17:56:26 +01:00
thierry
1b5352688f
better png transparency handling
2016-01-18 16:10:02 +01: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
Kai Hugo Hustoft Endresen
551b5d3e1a
StereoSGBM.cpp - use SSE2 for pass 2 using MODE_HH
...
With a test image set of 2800x1400 bytes on a Intel Core i7 5960X this improves runtime of MODE_HH with about 10%. (this particular replaced code segment is approx 3 times faster than the non-SSE2 variant). I was able to reduce runtime by 130 ms by this simple fix.
The second part of the SSE2 optimized part could probably be optimized further by using shift SSE2 operations, but I imagine this would improve performance 10-20 ms at best.
2016-01-08 00:32:52 +01: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
Ishank gulati
e607a85df6
png-image-compatibility
2015-12-23 23:37:32 +05:30
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
Pavel Rojtberg
b3bbe7704d
add jaccardDistance measure for rectangle overlap
...
computes the complement of the Jaccard Index as described in
https://en.wikipedia.org/wiki/Jaccard_index . For rectangles this reduces
to computing the intersection over the union.
2015-12-23 13:12:45 +01: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
Ishank gulati
9636b5e821
reduce k_fold parameter
2015-12-22 15:47:11 +05:30
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::createContinuous
effectively 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
Maksim Shabunin
e8bf4417ef
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
2015-11-17 15:30:01 +03:00
Maksim Shabunin
7df392bfd8
run.py: issues with forced configuration fixed
2015-11-16 14:02:26 +03:00
Philipp Hasper
4d3915f69a
Fixed mjpeg frame size attribution
2015-11-16 08:40:09 +01:00
Pavel Rojtberg
81e814d9ed
clean up fisheye calibration code
...
improves performance by factor 1.2 to 2.0
2015-11-16 02:24:53 +01:00
Ilya Lavrenov
0050df8750
GraphCut deprecated in 7.5 and removed in 8.0
2015-11-15 00:56:56 +03:00
Maksim Shabunin
97878645bc
Fix run.py test detection issues for debug VS configurations
2015-11-13 18:55:19 +03:00
Maksim Shabunin
01b5971c94
Merge pull request #5640 from mshabunin:restore-ts-gpu
2015-11-13 15:47:17 +00:00
Pavel Rojtberg
c209f795b5
support for NORM_L2SQR in norm(Matx<..>)
2015-11-13 14:29:56 +01:00
Bert
d3b0bda011
Update system.cpp
...
FreeBSD compilation fix
2015-11-13 11:03:34 +03:00
mbarann
b48b2d43b0
MSMF expects a bottom-up video frame, so the buffer pointer must point to the end of the data and the stride needs to be negative
2015-11-12 13:13:45 +01:00
berak
0baf0bdc24
AKAZE: check channels instead of type in detectAndCompute
...
add same CV_32F and CV_16U support for KAZE
2015-11-12 12:48:03 +01:00
Vladislav Vinogradov
39854ceda4
cuda::StreamAccessor::wrapStream and cuda::EventAccessor::wrapEvent
...
to import existed CUDA stream or CUDA event to OpenCV
2015-11-12 13:38:29 +03:00
Vladislav Vinogradov
8d3850ac02
add cv::gpu::StreamAccessor::wrapStream method
...
it allows to import existed CUDA stream to OpenCV
2015-11-12 13:07:30 +03:00
Alexander Alekhin
1862d1995f
Merge pull request #5652 from jet47:core-test-math-warning-fix
2015-11-12 03:10:46 +00:00
Pavel Rojtberg
9233472bdd
use cpp functions in CvLevMarq::step for better readability
2015-11-12 00:20:13 +01:00
Tian Zhi
f0434d60b0
fixed the type inconsistent with document.
...
Document say probs will have CV_64F type. But in effect, it has CV_32F type.
http://docs.opencv.org/3.0.0/d1/dfb/classcv_1_1ml_1_1EM.html#a2ea7da92a75bc7a7d665c241f547b9b9
2015-11-12 02:54:18 +08:00
Jan Starzynski
2799829bc9
fix potential buffer overflow as in 3.0
2015-11-11 16:19:20 +01:00
jiakai
933dfed4b8
check offset in ExifReader::getString
2015-11-11 20:17:24 +08:00
Vladislav Vinogradov
d5e6503fe5
fix signed/unsigned comparison warning in core/test/test_math.cpp
2015-11-11 11:53:39 +03:00
hoangviet1985
6441620f45
The right signs give the right results
2015-11-10 16:18:07 -05:00
Vadim Pisarevsky
b4112a5878
Merge pull request #5480 from dtmoodie:vecgpumat
2015-11-10 17:02:21 +00:00
Vadim Pisarevsky
3942b1f362
Merge pull request #5340 from alalek:ocl_off
2015-11-10 16:53:36 +00:00
Marian Zajko
1eb9ef6bbf
Fixed downsampling parameter enumerator backward compatibility.
2015-11-10 17:18:10 +01:00
Vadim Pisarevsky
18f4e55692
Merge pull request #5472 from StevenPuttemans:remove_unexisting_function
2015-11-10 16:14:43 +00:00
Vadim Pisarevsky
0f288d1082
Merge pull request #5605 from hoangviet1985:fix_bug_5599
2015-11-10 16:13:26 +00:00
Vadim Pisarevsky
82c1c68560
Merge pull request #5622 from LorenaGdL:hitAndMiss2.4
2015-11-10 16:03:48 +00:00
Vadim Pisarevsky
780b713016
Merge pull request #5638 from hoangviet1985:fix_bug_5623
2015-11-10 16:01:48 +00:00
Marian Zajko
286055b0d8
Removed trailing whitespace.
2015-11-10 12:25:57 +01:00
Marian Zajko
2cebe5a3b0
Fixed parameter enumrators list order to retain binary compatibility.
2015-11-10 12:07:19 +01:00
Marian Zajko
2998248dd3
Removed whitespaces reported by buildbot.
2015-11-09 13:30:08 +01:00
Marian Zajko
352b121202
Fixed whitespace issue
...
Removed tabulators from enumerators and ximea adapter source as reported
by precommit docs test.
2015-11-09 12:07:53 +01:00
Pavel Rojtberg
742fb559f7
use cpp functions in cvCalibrateCamera2 to make it more readable
2015-11-08 19:25:38 +01:00
Pavel Rojtberg
955f489621
make CV_CAP_PROP_FORMAT consider the current channel count
2015-11-08 17:01:03 +01:00
Pavel Rojtberg
05f52b697f
replace uyvy_to_rgb24 by tested and conformant cvtColor
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
ad68b79630
replace yuv420p_to_rgb24 by tested and conformant cvtColor
...
Conversion was not ITU 601 conformant. Also add YVU420 format to allowed
zero copy access.
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
8527d895bb
replace rgb24_to_rgb24 by tested cvtColor
...
internally using ipp this conversion is now roughly 2x faster.
also add RGB/ BGR formats to allowed zero copy access.
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
f50817120e
v4l: remove needless CvCaptureCAM_V4L_CPP wrapper
...
possible source of memory leaks and unneeded complexity
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
93d6e800b6
v4l: Fixed memory leaks and inconsistent status return values
...
by updating to c++ coding conventions
- const correctness
- use bool as return value
- use explicit initialization instead of CLEAR macro/ memset
- use cv namespace
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
a581ddd896
remove support of Video4Linux1 API
...
the last kernel that allowed compiling this code was 2.6.37 which was
released almost 5 Years ago. So probably it does not get much testing
any more. Furthermore even back then one was better off using the V4L2
API.
The only change touching currently used code is the removal of the
global V4L2_SUPPORT variable.
2015-11-08 17:01:02 +01:00
berak
28974e7290
remove usage of obsolete _dataAsRows flag
2015-11-06 19:59:25 +03:00
Maksim Shabunin
ffb9e877e9
Restore ts/gpu_perf.hpp, trying to compile with VS 2015
2015-11-06 13:26:58 +03:00
Viet Dinh
57829d81ea
mac compile error
2015-11-05 23:31:30 -05:00
Viet Dinh
a20a273982
Merge remote-tracking branch 'Itseez/2.4' into fix_bug_5599
2015-11-05 23:20:04 -05:00
Viet Dinh
a1532582a6
optimize code
2015-11-05 19:38:24 -05:00
Viet Dinh
68bcff26fb
fix solveCubic
...
The original solution did not handle correctly when delta = 0,
resulting as nan errors. I also wrote a test case to test solving
equation x^3 = 0 after fixing.
2015-11-05 19:19:56 -05:00
Marian Zajko
691fb1ffae
XIMEA adapter update
...
- replaced m3api/m3apiX64 binaries with latest xiapi32/xiapi64 to
support latest camera models
- added new parameter definitions to videoio_c.h and
SetProperty/GetProperty calls
- added acquisition resetting for specific parmateters in SetProperty
call
- added new error return value evaluators
2015-11-05 15:56:47 +01:00
Maksim Shabunin
7392ce0a81
Added some documentation for MSER
2015-11-05 17:17:18 +03:00
jiakai
80df9ddedb
check for exifSize
2015-11-05 18:32:51 +08:00
jiakai
1260060d7d
check boundary in ExifReader
2015-11-05 17:58:35 +08:00
Viet Dinh
433bc81b30
std::cbrt could not be found
2015-11-03 21:40:52 -05:00
Viet Dinh
c8bf176558
casting warning
2015-11-03 21:10:38 -05:00
Viet Dinh
cfd5caf29d
deal with type casting issues
2015-11-03 16:19:41 -05:00
Viet Dinh
f461d0cb7a
fix compile errors
...
some functions were not found in namespace std
2015-11-03 15:37:25 -05:00
Viet Dinh
09b0193186
even more correct
...
calculates cube root of complex number to give more correct results.
2015-11-03 15:17:49 -05:00
Lorena García
252feb4774
Hit and Miss morphological op
2015-11-03 19:42:22 +01:00
Viet Dinh
537a978dcf
update test_math.cpp
2015-11-03 12:52:49 -05:00
yigitsoy
16a3773a34
Fix inlier assignment in Hungarian algorithm
...
While checking whether a match is a real match, the index of the corresponding column (row) for a row (column) is checked. The limit should be the number of the real columns (rows) for a given row (column).
2015-11-03 15:37:49 +01:00
Vadim Pisarevsky
de49ed3c15
Merge pull request #5388 from alalek:disable_invalid_string_usage
2015-11-03 10:58:57 +00:00
Vadim Pisarevsky
33dc41056f
Merge pull request #5392 from elenash:fisheye_fix
2015-11-03 10:57:36 +00:00
Alexander Alekhin
4514158e43
Merge pull request #5617 from lupustr3:pvlasov/ipp9_fixes
2015-11-03 10:18:44 +00:00
Abe Friesen
9c6ff4d955
- LogisticRegressionImpl::predict() was changed to return the predicted value and to only write to the OutputArray results if specified (no longer segfaults).
...
- Refactored batch and mini_batch training to use a common gradient computation function (removed duplicate code).
- Altered the cost computation so that NAN is not computed unnecessarily.
- Greatly simplified (and sped up) the code that appends a column of 1s to the data.
- Minor code cleanup.
Removed unused variables.
Added cast to float to remove warning
2015-11-02 17:49:06 -08:00
Vadim Pisarevsky
979f88f6db
Merge pull request #5518 from Bovaz:master
2015-11-02 15:58:58 +00:00
Vadim Pisarevsky
8512ca7490
Merge pull request #5484 from PolarNick239:master
2015-11-02 15:45:59 +00:00
Vadim Pisarevsky
67ef84d883
Merge pull request #5386 from StevenPuttemans:add_markers
2015-11-02 15:45:38 +00:00
Pavel Vlasov
4d7f9e06e8
Fix for copy with mask 32s and 8u;
2015-11-02 18:00:22 +03:00
Viet Dinh
b6e8a47fca
fix whitespace errors
2015-11-02 09:28:37 -05:00
Viet Dinh
ed0065266e
update fixing bug #5599
2015-11-02 08:38:05 -05:00
Vadim Pisarevsky
b5fd7868a8
Merge pull request #5487 from Wangyida:python
2015-11-02 12:26:53 +00:00
Vadim Pisarevsky
c21ed69731
Merge pull request #5586 from mshabunin:run-py-changes-2.4
2015-11-02 12:05:00 +00:00
Vadim Pisarevsky
a69fd6029a
Merge pull request #5512 from edgarriba:gdal_lan
2015-11-02 11:53:08 +00:00
Vadim Pisarevsky
3c31d6add3
Merge pull request #5515 from LorenaGdL:hitAndMiss
2015-11-02 11:49:37 +00:00
Vadim Pisarevsky
b2f6aedec9
Merge pull request #5587 from lupustr3:pvlasov/ipp_cond_update
2015-11-02 11:38:02 +00:00
Vadim Pisarevsky
46dd502f4a
Merge pull request #5602 from ChrisKitching:clearerMatErrors
2015-11-02 11:37:34 +00:00
Vadim Pisarevsky
39346f3204
Merge pull request #5592 from berak:python_rect2d
2015-11-02 11:36:03 +00:00
Vadim Pisarevsky
32b44173e7
Merge pull request #5595 from mshabunin:fix-bitonal-tif
2015-11-02 11:32:17 +00:00
Vadim Pisarevsky
00f222a9b4
Merge pull request #5598 from ajbernal:ocl_bilateral_bugfix
2015-11-02 11:22:25 +00:00
Viet Dinh
03e7b71707
fix whitespace errors
2015-11-02 00:50:05 -05:00
Viet Dinh
e06c696b3c
fix whitespace errors
2015-11-02 00:20:13 -05:00
Viet Dinh
40ce9f97d6
fix whitespace errors
2015-11-02 00:04:51 -05:00
Viet Dinh
0bc44376a5
fix bug #5599
...
solves equations more correctly, eliminates “nan” error.
2015-11-01 23:30:28 -05:00
Viet Dinh
fdf549b921
fix bug #5599
2015-11-01 11:08:01 -05:00
edgarriba
f50858dd24
set GA_ReadOnly flag again since test error
2015-11-01 12:07:05 +01:00
Chris Kitching
0f8a266787
Make Mat assertion failures more helpful
...
Instead of chaining a bunch of sanity checks together with "&&", let's just have several asserts. That way, when an assert fails, you don't get a monsterous "<huge evil expression>
failed" error, but only the bit you care about, making your life rather a lot easier.
2015-11-01 01:02:15 +00:00
edgarriba
a242556b1d
Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan
...
Conflicts:
modules/imgcodecs/include/opencv2/imgcodecs.hpp
2015-10-31 20:18:41 +01:00
edgarriba
decdae515b
set GA_Update flag in order remove ERROR 8: band 1: Attempt to write to read only dataset inGDALRasterBand::Fill()
2015-10-31 20:11:05 +01:00
edgarriba
9ff14bc411
add support for float32 and float 64
2015-10-31 20:00:39 +01:00
grundman
f609ddba05
Fix incorrect FPS value returned by cap.get(CV_CAP_PROP_FPS)
...
Current implementation returns NaN for some configs of FFMPEG, call default get_fps() instead (as also used by PROP_POS_MSEC)
2015-10-30 17:48:04 -07:00
Ariel Bernal
cc903d0605
Fix for #5590 . OpenCL BilateralFilter implementation failes to
...
build for some OCL drivers.
Some OCL vendors treat implicit scalar-vector conversions for
operators as errors when type conversion is required.
2015-10-30 09:39:11 -07:00
Hajo Nils Krabbenhöft
a8e550f5bf
Fixed crash when reading b/w tif images ( fixes #5579 )
2015-10-30 17:41:52 +03:00
berak
1048b235bf
add Rect2d to python bindings
2015-10-30 10:02:33 +01:00
Pavel Vlasov
5ae3693567
Condition update for 8u IPP in GaussianBlur. Bug was fixed in 9.0.1;
2015-10-29 13:21:13 +03:00
Maksim Shabunin
1e869c5e49
ts: refactor run.py script
...
Conflicts:
modules/ts/misc/run.py
2015-10-29 13:04:05 +03:00
Maksim Shabunin
f49936a849
Fixed cmake and build issues when using Visual Studio 2015
2015-10-29 11:50:48 +03:00
Maksim Shabunin
90c74e3be0
ts: refactor run.py script
2015-10-29 11:28:12 +03:00
Wangyida
ca599eee40
python modification for Point3D
2015-10-29 10:24:49 +08:00
Anton V. Shokurov
b9b40a73ba
Exposure and autofocus properties fixed/added.
...
Exposure can now be manually controlled (implemented only in libv4l).
Will work only with a kernel version >= 4.5.
Autofocus can be enabled/disabled.
2015-10-28 07:37:51 -04:00
Ilya Lavrenov
9e2395e7e0
return false in grabFrame failed in open method
2015-10-27 16:56:31 +03:00
Ilya Lavrenov
05945bf00e
fixed case when grabbing failed
2015-10-27 16:26:24 +03:00
Ilya Lavrenov
9d78a1ea9f
allow to retrieve videocapture properties before first frame reading
2015-10-26 14:37:38 +03:00
Alexander Alekhin
dfec99691b
Merge pull request #5370 from berak:fix_svm_autoTrain
2015-10-26 10:47:29 +00:00
Alexander Alekhin
8c2d712fb0
Merge pull request #5538 from micalan:JpegExif
2015-10-25 15:18:08 +00:00
Alexander Alekhin
c3eb1254cf
Merge pull request #5570 from paroj:qsliderfix
2015-10-24 14:38:38 +00:00
Pierre Letessier
e6615c5825
Changed CV_FFMPEG_CAP_PROP_SAR_* values
2015-10-24 11:22:18 +02:00
Lorena García
7cff60f4f6
Changed src matrix complement computation
2015-10-24 00:33:36 +02:00
jisli
251610f6a1
fix header problem(can't find cstdint) on OSX platform
2015-10-23 15:25:26 -07:00
Lorena García
fb03330ea3
Fixed CV_Assert
2015-10-24 00:22:50 +02:00
Pavel Rojtberg
cfd498a8eb
fix compilation with qt
...
QSlider does not have getMinimum/Maximum getters. Probably was not
compile tested.
2015-10-23 21:42:11 +02:00
Pierre Letessier
baa21484a1
Added CV_CAP_PROP_SAR properties to videoio module
2015-10-23 21:14:22 +02:00
micalan
0a306f8804
Camera orientation handling is added for jpeg files
2015-10-23 21:19:35 +03:00
Alexander Alekhin
9a0beda037
Merge pull request #5489 from paroj:v4l2noconvert
2015-10-23 16:35:36 +00:00
Alexander Alekhin
09e6c82190
Merge pull request #5474 from paroj:v4l2ctrls
2015-10-23 16:28:26 +00:00
Rodrigo Benenson
0ef7387298
mush -> must
...
fixed typo
2015-10-22 23:27:55 +02:00
Alexander Alekhin
debe99f1a4
Merge pull request #5531 from mshabunin:fix-vs2015
2015-10-22 16:28:42 +00:00
Alexander Alekhin
031568831c
Merge pull request #5513 from jet47:ctest-extended-support
2015-10-22 12:37:40 +00:00
Maksim Shabunin
497d92e7d1
Merge pull request #5533 from sturkmen72:patch-12
2015-10-22 12:30:38 +00:00
Maksim Shabunin
1cb0dfa669
Merge pull request #5500 from StevenPuttemans:fix_mask_notice_copyTo_2.4
2015-10-22 12:28:54 +00:00
Maksim Shabunin
4e7a14355d
Merge pull request #5499 from StevenPuttemans:fix_mask_notice_copyTo
2015-10-22 12:27:45 +00:00
Maksim Shabunin
ff35726fc3
Merge pull request #5432 from sturkmen72:patch-11
2015-10-22 12:24:47 +00:00
Maksim Shabunin
31e0d90da6
Enable temp objects destruction test for VS versions less than 2015
2015-10-22 12:44:03 +03:00
Vadim Pisarevsky
b34f0d99bb
Merge pull request #5539 from sturkmen72:patch-14
2015-10-21 11:54:52 +00:00
Vadim Pisarevsky
66f2000548
Merge pull request #5532 from grundman:patch-2
2015-10-21 11:54:30 +00:00
Vadim Pisarevsky
91e9e6489b
Merge pull request #5542 from renatoGarcia:matx_constructors
2015-10-21 11:46:27 +00:00
Vadim Pisarevsky
f820df2ea0
Merge pull request #5543 from aman11dhanpat:master
2015-10-21 11:44:35 +00:00
Maksim Shabunin
6e9d0d9a0c
Visual Studio 2015 warning and test fixes
2015-10-20 12:48:37 +03:00
Alexander Alekhin
1648e9292c
Merge pull request #5431 from MiguelAlgaba:em_one_cluster
2015-10-19 15:27:35 +00:00
Aman Verma
d5e314e728
Fixing compilation errors in windows and mac
2015-10-19 10:58:43 +00:00
Aman Verma
b0209ad7f7
Fix for #5495 : add setTrackbarMin
2015-10-19 08:44:06 +00:00
Renato Florentino Garcia
f5b98bea41
Fix behavior of Matx 12 and 16 args constructors.
...
The 12 and 16 arguments Matx constructors differs from all others,
leaving values initialized and requiring the argument number to be equal
to the channels number.
2015-10-18 23:16:21 -02:00
Suleyman TURKMEN
51e687f7a9
Update imgproc.hpp
2015-10-18 15:53:15 +03:00
Pavel Rojtberg
eac5cab5cb
cap_v4l: implement PROP_CONVERT_RGB
...
allows disabling automatic conversion to RGB for certain formats. If
conversion is disabled the returned image just points to the underlying
buffer, so no memcpy is performed.
Note that we do not check image size in retrieve frame any more as it
can not possibly while the device is streaming.
Furthermore this code was disabled altogether by the wrong ifdef in the
previous commit.
2015-10-18 14:14:20 +02:00
Pavel Rojtberg
5e62e71b13
fix wrong ifdef bracketing
...
in the case of HAVE_CAMV4L2 && !HAVE_CAMV4L there was no body for the if
statement.
2015-10-18 14:13:44 +02:00
Pavel Rojtberg
838947bb8e
replace custom yuyv_to_rgb24 implementation by cvtColor
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
80747088e3
avoid needless copies during mjpeg decoding
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
56dd7eda0d
remove additional V4L2 pixelformat defines
...
they are upstream since at least linux 2.6.8 (10 Years)
http://lxr.oss.org.cn/ident?v=2.6.8&i=V4L2_PIX_FMT_SBGGR8
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
588eba3b37
simplify autosetup_capture_mode_v4l2 by using a for loop
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
5525cc4d09
implement CAP_PROP_MODE, CAP_PROP_FOURCC and CAP_PROP_FORMAT
...
do not use a custom enum instead of the V4L2 fourcc defines for palette.
This way we can easily implement CAP_PROP_FOURCC and CAP_PROP_MODE.
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
c0fe522c9d
allow changing FPS and Image Size using V4L2
...
use logic similar to cap_libv4l: replace icvSetVideoSize by v4l2_reset
as it was not used for V4L1, the actual frame format is negotiated in
try_palette_v4l2 and the stream has to restarted anyway.
2015-10-18 13:51:16 +02:00
Pavel Rojtberg
18034a5138
allow icvGetPropertyCAM_V4L to return zero
...
now icvGetPropertyCAM_V4L behaves the same as in cap_libv4l. This also
fixes passing boolean values.
2015-10-18 13:48:15 +02:00
Pavel Rojtberg
f7981a8ae8
support setting focus and autofocus with V4L2
...
also refactor property range handling and opencv property to V4L2
translation.
2015-10-18 12:56:09 +02:00
Suleyman TURKMEN
73240b736b
Update camera_calibration_and_3d_reconstruction.rst
2015-10-16 22:30:00 +03:00
grundman
f260b13a6f
Fix racy modification of ForThread::m_state during invocation of stop()
2015-10-16 11:19:27 -07:00
Jan S. (Milania1)
3e0b1f2845
Added example to the documentation for the NormTypes enum (L1, L2, INF)
2015-10-15 19:16:07 +02:00
Bovaz
7be3d3ab2c
sqrtf to std::sqrt
2015-10-14 18:57:33 -07:00
Matteo Piovanelli
216baf5b11
Speedup of arcLength
...
By my tests, this version of cv::arcLength is almost 10% faster than the
one using a buffer it replaces.
2015-10-14 13:37:48 -07:00
Alexander Alekhin
37ce3b8cfe
Merge pull request #5478 from alalek:fix_android_pack_build
2015-10-14 13:05:18 +00:00
Lorena García
33f77774c5
Hit&Miss morphological operation
2015-10-14 14:01:53 +02:00
Alexander Alekhin
dcca0b499c
Merge pull request #5509 from spmallick:master
2015-10-14 09:14:10 +00:00
Alexander Alekhin
d8c352d20d
Merge pull request #5504 from aman11dhanpat:master
2015-10-14 09:10:30 +00:00
Alexander Alekhin
c1545c6f2a
Merge pull request #5502 from AlexanderStohr:file-handle-volatile-fix
2015-10-14 09:09:30 +00:00
edgarriba
1e9bd59f07
load multi/hyperspectral images with using gdal
2015-10-14 09:16:04 +02:00
spmallick
066c775321
Update window_QT.h
...
QPushButton was included twice.
2015-10-13 15:51:43 -07:00
a-andre
d16fb30512
install opencv2/highgui.hpp header
2015-10-13 18:16:14 +02:00
Vladislav Vinogradov
02c48ab7d6
add CTest support to build tree
2015-10-13 17:34:08 +03:00
Vladislav Vinogradov
d81d51d155
assing labels to targets and sources
2015-10-13 17:33:26 +03:00
Alexander Alekhin
466a98f7c3
Merge pull request #5493 from lupustr3:pvlasov/ipp9_fixes
2015-10-13 14:24:09 +00:00
AlexanderStohr
0098c4b571
fix VS2010 error with type mismatch due to volatile qualifier
2015-10-13 16:15:49 +02:00
Alexander Stohr
7e3d7677ae
not only print file-not-found as a warning but also print the name of the problematic file and the uri used for the open attempt
2015-10-13 16:15:48 +02:00
StevenPuttemans
8ed25ad75f
adding extra explanation for mask parameter
2015-10-13 15:21:35 +02:00
StevenPuttemans
0a708e4070
adding extra explanation for mask parameter
2015-10-13 15:19:50 +02:00
Alexander Smorkalov
408107ce6d
Added missing copyright headers.
2015-10-13 15:02:38 +03:00
Pavel Vlasov
40b2dfae09
Fix for filter2D and IPP < 900
2015-10-13 14:10:32 +03:00
Aman Verma
411be4fde8
Fix for #5481 , removing repeated/useless assignment in contours.cpp
2015-10-12 16:16:27 +00:00
Alexander Alekhin
ddd91bcebf
android: add targetSdkVersion="21"
2015-10-12 18:12:34 +03:00
Dan
1e1f20cfee
Improved consistency.
2015-10-12 09:21:53 -04:00
Alexander Alekhin
779dad12fb
Merge pull request #5491 from ilya-lavrenov:video-writers-delete
2015-10-12 10:48:16 +00:00
Pavel Vlasov
89eee6ca99
Fixes for IPP integration:
...
dotProd_16s - disabled for IPP 9.0.0;
filter2D - fixed kernel preparation;
morphology - conditions fix and disabled FilterMin and FilterMax for IPP 9.0.0;
GaussianBlur - disabled for CV_8UC1 due to buffer overflow;
integral - disabled for IPP 9.0.0;
IppAutoBuffer class was added;
2015-10-12 10:51:28 +03:00
Ilya Lavrenov
0d5b739d35
delete video readers
2015-10-12 00:40:23 +03:00
Ilya Lavrenov
ec5244a73a
fixed memory leak in findHomography tests
2015-10-12 00:11:45 +03:00
Amro
13a0a37e63
fix randMVNormal in ML ( #5469 )
...
Fix the failed assertion by replacing the GEMM call.
Also random numbers are generated from normal distribution ~N(0,1),
instead of uniform distribution ~U(0,1).
2015-10-11 01:54:11 +03:00
Nickolay Polyarniy
846e6f731a
stereoRectifyUncalibrated: assertion of input points shape fixed
...
Fix for https://github.com/Itseez/opencv/issues/4426
Documentation says that input points format is the same to input for findFundamentalMat
2015-10-10 14:00:31 +03:00
Dikay900
7b0b12de58
appropriate logic behind last accepted stage when rejectingLevels is true
2015-10-09 23:19:42 +02:00
Dan Moodie
3d1355efc1
Updated input / output array to support std::vector<cv::cuda::GpuMat>
...
Expanded support for std::vector<cv::cuda::GpuMat>.
Whitespace fix.
2015-10-09 15:12:57 -04:00
Alexander Alekhin
dbcc55a196
cleanup <build>/src|gen folders to remove stalled/unused Java files
2015-10-09 17:28:50 +03:00
Alexander Alekhin
441eeef319
Merge pull request #5470 from apavlenko:android_camera_gl_view
2015-10-08 13:31:51 +00:00
Andrey Pavlenko
23fea91e84
minor fixes
2015-10-08 12:37:59 +03:00
StevenPuttemans
47db20eced
removing unexisting functionality in ML header
2015-10-08 11:10:05 +02:00
Alexander Alekhin
484c68cbb8
Merge pull request #5460 from sergiud:highgui-autosize-gtk3
2015-10-07 14:47:16 +00:00
Alexander Alekhin
56e8827ce0
Merge pull request #5456 from sergiud:ffmpeg-capture-varying-frame-size
2015-10-07 14:42:29 +00:00
Andrey Pavlenko
15db8243ef
refactored; added Camera2, notify callbacks, front/back maxCamera sizes; disable new stuff if target API < 21
2015-10-07 15:01:32 +03:00
Alexander Alekhin
454e5e5fa4
Merge pull request #5461 from berak:fix_putText_24
2015-10-06 17:12:25 +00:00
Alexander Alekhin
706b8a6266
Merge pull request #5459 from aman11dhanpat:master
2015-10-06 17:12:03 +00:00
Alexander Alekhin
559b538be8
Merge pull request #5458 from berak:fix_putText
2015-10-06 17:11:47 +00:00
berak
bb9bd3132a
fix zero length std::string in putText()
2015-10-06 18:31:00 +02:00
berak
f2decec3e8
fix zero length std::string in putText()
2015-10-06 17:07:40 +02:00
Sergiu Dotenco
514b202d7b
highgui: CV_WINDOW_AUTOSIZE does not resize with GTK3
2015-10-06 17:01:28 +02:00
Aman Verma
dff7037156
Adding fix for issue 5451 "putText fails with empty std::string"
2015-10-06 14:23:27 +00:00
Sergiu Dotenco
9da4fe4b02
videoio: fixed segmentation fault at frame size change
2015-10-06 15:09:31 +02:00
Alexander Alekhin
6025738b8b
Merge pull request #5454 from alalek:fix_ffmpeg_priv_data
2015-10-06 10:01:59 +00:00
Alexander Alekhin
7a4b2e18a7
Merge pull request #5441 from alalek:fix_ffmpeg_frame_creation
2015-10-06 10:01:39 +00:00
Alexander Alekhin
4760d32937
ffmpeg: fix invalid NULL pointer access
...
Catched on Ubuntu 12.04 with FFMPEG:
codec: YES (ver 53.35.0)
format: YES (ver 53.21.1)
util: YES (ver 51.22.3)
swscale: YES (ver 2.1.0)
resample: NO
gentoo-style: YES
2015-10-05 19:28:35 +03:00
Alexander Alekhin
33f5ac5c15
Merge pull request #5429 from PhilLab:patch-6
2015-10-05 12:50:17 +00:00
Alexander Alekhin
59a41c1c51
Merge pull request #5453 from paroj:capgstleak
2015-10-05 12:47:11 +00:00
Pavel Rojtberg
345cd1242f
do not leak GstMapInfo
...
it is new'ed but never deleted. However it does not need to be global or
heap allocated in the first place.
2015-10-05 12:28:47 +02:00
Jan S. (Milania1)
3d2a24f61d
Added example to the documentation for the normalize() method
2015-10-04 20:23:45 +02:00
Alexander Alekhin
50a0a167f0
fix ffmpeg frame creation ( fix #5439 )
2015-10-02 18:27:18 +03:00
Alexander Alekhin
76afd9a1b5
Merge pull request #5436 from jet47:fix-cuda-normalize
2015-10-02 12:50:38 +00:00
Alexander Alekhin
b37387ef90
Merge pull request #5425 from lupustr3:pvlasov/ipp_initialization_changes
2015-10-02 12:49:37 +00:00
Suleyman TURKMEN
21c0acff24
Update imgcodecs.hpp
2015-10-02 14:00:24 +03:00