Roman Donchenko
6d1ec452fc
Merge pull request #1125 from SpecLad:softcascade-nowarn
12 years ago
Roman Donchenko
1160b04fb4
Fixed a build warning in softcascade.
12 years ago
Roman Donchenko
3443fd85cd
Merge pull request #984 from albenoit:master
12 years ago
alexandre benoit
12f65c61a8
updated doc wrt new bioinspired namespace convention
12 years ago
Roman Donchenko
52a9378257
Merge pull request #979 from jet47:gpuwarping-refactoring
12 years ago
Roman Donchenko
1590a1a538
Merge pull request #1068 from AoD314:webp2
12 years ago
alexandre benoit
7fe78efda3
retina included in namespace bioinspired + followed suggestions made by Vadim
12 years ago
andrey.morozov
7d5185e8f1
updated webp to version 0.3.1
12 years ago
andrey.morozov
e4e0862c2e
added support image with alpha channel
12 years ago
Roman Donchenko
616dbd53f0
Merge pull request #1107 from abidrahmank:master
12 years ago
Roman Donchenko
3b8a13a1ed
Merge pull request #1101 from jet47:cudev-stub-lib
12 years ago
Vladislav Vinogradov
d52ef2f758
added stub library for cudev module
...
in order to make CMake scripts work properly
12 years ago
Vladislav Vinogradov
0d9e3cfa37
updated documentation
12 years ago
Vladislav Vinogradov
6d6ff26887
refactored gpu::ImagePyramid (converted it to abstract interface)
12 years ago
Vladislav Vinogradov
2932beddcf
switched to Input/Output Array in gpuwarping functions
12 years ago
Andrey Pavlenko
75b86c9706
Merge pull request #1104 from nikman-ru:cap_reuse
12 years ago
Andrey Pavlenko
decd0c753a
Merge pull request #1082 from jet47:gpu-warnings-fix
12 years ago
abidrahmank
1923d87f61
PyDocs for common interface of feature2d
12 years ago
abidrahmank
f91f369788
PyDocs for FAST, ORB etc
12 years ago
abidrahmank
2047838106
feature2d drawing functions PyDocs
12 years ago
abidrahmank
031c77f4eb
SIFT+SURF PyDocs
12 years ago
abidrahmank
5d863f7516
drawMatches python bindings
12 years ago
Nikita Manovich
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.
12 years ago
Roman Donchenko
68a992b075
Merge pull request #1096 from SpecLad:merge-2.4
12 years ago
Roman Donchenko
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
12 years ago
Andrey Pavlenko
1a2458885b
Merge pull request #1094 from asmorkalov:android_na_fix
12 years ago
andrey.morozov
8d0452ed59
added test to save image with webp with alpha channel
12 years ago
Alexander Smorkalov
69b308a368
Various fixes in android sample NativeActivity.
12 years ago
Roman Donchenko
f5089100b9
Merge pull request #1073 from asmorkalov:android_cvjavaframe
12 years ago
Roman Donchenko
de58039b46
Merge pull request #1081 from SpecLad:merge-2.4
12 years ago
Roman Donchenko
2f8be2a4b1
Merge pull request #1083 from jet47:cuda-device-layer
12 years ago
Roman Donchenko
c4e59866a2
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
12 years ago
Andrey Pavlenko
b6b1d5e75d
Merge pull request #1092 from asmorkalov:manager_version_inc
12 years ago
Roman Donchenko
36a4d246f4
Merge pull request #1087 from znah:2.4
12 years ago
Alexander Smorkalov
e905c81ccc
OpenCV Manager version++.
12 years ago
Roman Donchenko
dbf02c71b6
Merge pull request #1091 from SpecLad:xls-updates
12 years ago
Roman Donchenko
2b44172026
xls-report.py: make behaviour more intelligent in case of repeated results
12 years ago
Roman Donchenko
0732905cff
xls-report.py: write tests in sorted order
12 years ago
Roman Donchenko
ea054e2888
xls-report.py: made most columns a little wider
12 years ago
Roman Donchenko
4e939e2fce
xls-report.py: added an option to include data from unrecognized XMLs
12 years ago
Roman Donchenko
ec1df9f54d
Merge pull request #1090 from asmorkalov:android_tbb_downgrade
12 years ago
Alexander Smorkalov
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.
12 years ago
Roman Donchenko
4d45b3e7f9
Merge pull request #1089 from SpecLad:contract-violations
12 years ago
alexandre benoit
188f889949
Merge branch 'master' of code.opencv.org:opencv
12 years ago
Roman Donchenko
83fd385bbd
xls-report.py: don't eat all errors when reading sheet.conf
12 years ago
Alexander Mordvintsev
3677a66403
line realign
12 years ago
Roman Donchenko
a2d576c1bb
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
12 years ago
Roman Donchenko
4d569732b9
Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
12 years ago
Roman Donchenko
0daf4b800a
Fix bug: CommandLineParserParams's comparator would fail with equal arguments.
12 years ago
Roman Donchenko
4692d4b36e
Fix bug: cv::String would break if assigned to itself.
12 years ago