4f68212e64
Merge pull request #1124 from SpecLad:matx-div
2013-07-17 13:32:26 +04:00
8f2047ada4
Merge pull request #1093 from jet47:fix-gpu-stream-test
2013-07-17 13:18:25 +04:00
6d1ec452fc
Merge pull request #1125 from SpecLad:softcascade-nowarn
2013-07-16 15:12:25 +04:00
1160b04fb4
Fixed a build warning in softcascade.
2013-07-16 12:43:49 +04:00
924fc070f0
Changed / for Matx to Matx::div, for symmetry with Matx::mul.
2013-07-16 12:25:26 +04:00
3443fd85cd
Merge pull request #984 from albenoit:master
2013-07-16 11:57:52 +04:00
12f65c61a8
updated doc wrt new bioinspired namespace convention
2013-07-15 09:58:16 +02:00
52a9378257
Merge pull request #979 from jet47:gpuwarping-refactoring
2013-07-15 11:47:03 +04:00
1590a1a538
Merge pull request #1068 from AoD314:webp2
2013-07-15 11:45:28 +04:00
7fe78efda3
retina included in namespace bioinspired + followed suggestions made by Vadim
2013-07-14 19:28:37 +02:00
7d5185e8f1
updated webp to version 0.3.1
2013-07-13 14:09:44 +04:00
e4e0862c2e
added support image with alpha channel
2013-07-13 14:09:37 +04:00
616dbd53f0
Merge pull request #1107 from abidrahmank:master
2013-07-12 11:40:33 +04:00
3b8a13a1ed
Merge pull request #1101 from jet47:cudev-stub-lib
2013-07-12 11:39:25 +04:00
d52ef2f758
added stub library for cudev module
...
in order to make CMake scripts work properly
2013-07-12 08:47:12 +04:00
5e3934446d
fixed test compilation for gpu::Stream
2013-07-12 08:45:55 +04:00
0d9e3cfa37
updated documentation
2013-07-12 08:12:48 +04:00
6d6ff26887
refactored gpu::ImagePyramid (converted it to abstract interface)
2013-07-12 08:12:48 +04:00
2932beddcf
switched to Input/Output Array in gpuwarping functions
2013-07-12 08:12:48 +04:00
75b86c9706
Merge pull request #1104 from nikman-ru:cap_reuse
2013-07-11 11:52:22 +04:00
decd0c753a
Merge pull request #1082 from jet47:gpu-warnings-fix
2013-07-11 09:41:46 +04:00
1923d87f61
PyDocs for common interface of feature2d
2013-07-11 09:33:32 +05:30
f91f369788
PyDocs for FAST, ORB etc
2013-07-11 09:32:49 +05:30
2047838106
feature2d drawing functions PyDocs
2013-07-11 09:31:25 +05:30
031c77f4eb
SIFT+SURF PyDocs
2013-07-11 09:30:21 +05:30
5d863f7516
drawMatches python bindings
2013-07-11 09:28:37 +05:30
21211308d0
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150 ).
...
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
bool VideoCapture::open(const string& filename);
bool VideoCapture::open(int device);
The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-10 17:48:44 +04:00
68a992b075
Merge pull request #1096 from SpecLad:merge-2.4
2013-07-09 11:50:19 +04:00
c05bfe9d6d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
1a2458885b
Merge pull request #1094 from asmorkalov:android_na_fix
2013-07-08 11:25:40 +04:00
8d0452ed59
added test to save image with webp with alpha channel
2013-07-06 17:26:22 +04:00
69b308a368
Various fixes in android sample NativeActivity.
2013-07-05 14:08:37 +04:00
f5089100b9
Merge pull request #1073 from asmorkalov:android_cvjavaframe
2013-07-05 13:41:51 +04:00
de58039b46
Merge pull request #1081 from SpecLad:merge-2.4
2013-07-05 13:34:59 +04:00
2f8be2a4b1
Merge pull request #1083 from jet47:cuda-device-layer
2013-07-05 13:30:11 +04:00
c4e59866a2
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
2013-07-05 13:28:38 +04:00
b6b1d5e75d
Merge pull request #1092 from asmorkalov:manager_version_inc
2013-07-05 13:02:10 +04:00
36a4d246f4
Merge pull request #1087 from znah:2.4
2013-07-05 12:07:45 +04:00
e905c81ccc
OpenCV Manager version++.
2013-07-05 12:07:04 +04:00
dbf02c71b6
Merge pull request #1091 from SpecLad:xls-updates
2013-07-05 12:00:52 +04:00
2b44172026
xls-report.py: make behaviour more intelligent in case of repeated results
2013-07-04 20:01:27 +04:00
0732905cff
xls-report.py: write tests in sorted order
2013-07-04 20:01:27 +04:00
ea054e2888
xls-report.py: made most columns a little wider
2013-07-04 20:01:27 +04:00
4e939e2fce
xls-report.py: added an option to include data from unrecognized XMLs
2013-07-04 20:00:59 +04:00
ec1df9f54d
Merge pull request #1090 from asmorkalov:android_tbb_downgrade
2013-07-04 19:46:53 +04:00
c2e6668414
Bug #3124 libopencv_java.so v 2.4.6 hangs on some Android 4.0.3 devices fixed.
...
Downgrade TBB to 4.1u2 for all platforms, except WinRT.
2013-07-04 18:52:52 +04:00
4d45b3e7f9
Merge pull request #1089 from SpecLad:contract-violations
2013-07-04 18:25:39 +04:00
188f889949
Merge branch 'master' of code.opencv.org:opencv
2013-07-04 16:19:24 +02:00
83fd385bbd
xls-report.py: don't eat all errors when reading sheet.conf
2013-07-04 18:03:03 +04:00
3677a66403
line realign
2013-07-04 17:43:38 +04:00
Roman Donchenko