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
|
2013-07-08 18:47:38 +04:00 |
|
ozantonkal
|
6e5ae98582
|
initial cloud widget implementation, fix safedowncasts
|
2013-07-08 15:12:50 +02:00 |
|
ozantonkal
|
d394e233bb
|
cube widget wireframe
|
2013-07-08 11:34:11 +02:00 |
|
ozantonkal
|
653eda45f8
|
text widget implementation
|
2013-07-08 10:41:42 +02:00 |
|
ozantonkal
|
c4f4727ee5
|
showWidget takes Affine3f as argument
|
2013-07-08 10:53:00 +03:00 |
|
Andrey Pavlenko
|
1a2458885b
|
Merge pull request #1094 from asmorkalov:android_na_fix
|
2013-07-08 11:25:40 +04:00 |
|
ozantonkal
|
eafcdc004d
|
plane widget size
|
2013-07-07 21:19:21 +03:00 |
|
ozantonkal
|
030400d50f
|
circle widget thickness property
|
2013-07-07 16:21:47 +03:00 |
|
andrey.morozov
|
8d0452ed59
|
added test to save image with webp with alpha channel
|
2013-07-06 17:26:22 +04:00 |
|
Fedor Morozov
|
0aee5b61e3
|
Exposure fusion. Code, tests.
|
2013-07-05 16:14:08 +04:00 |
|
Anatoly Baksheev
|
9d684a39da
|
Fixed ref counting bug, minor formatting
|
2013-07-05 14:35:12 +04:00 |
|
Anatoly Baksheev
|
45cdc41763
|
Merge pull request #13 from ozantonkal/implementing_widgets
Implementing widgets
|
2013-07-05 03:10:53 -07:00 |
|
Alexander Smorkalov
|
69b308a368
|
Various fixes in android sample NativeActivity.
|
2013-07-05 14:08:37 +04:00 |
|
Roman Donchenko
|
f5089100b9
|
Merge pull request #1073 from asmorkalov:android_cvjavaframe
|
2013-07-05 13:41:51 +04:00 |
|
Roman Donchenko
|
de58039b46
|
Merge pull request #1081 from SpecLad:merge-2.4
|
2013-07-05 13:34:59 +04:00 |
|
Roman Donchenko
|
2f8be2a4b1
|
Merge pull request #1083 from jet47:cuda-device-layer
|
2013-07-05 13:30:11 +04:00 |
|
Roman Donchenko
|
c4e59866a2
|
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
|
2013-07-05 13:28:38 +04:00 |
|
Andrey Pavlenko
|
b6b1d5e75d
|
Merge pull request #1092 from asmorkalov:manager_version_inc
|
2013-07-05 13:02:10 +04:00 |
|
Roman Donchenko
|
36a4d246f4
|
Merge pull request #1087 from znah:2.4
|
2013-07-05 12:07:45 +04:00 |
|
Alexander Smorkalov
|
e905c81ccc
|
OpenCV Manager version++.
|
2013-07-05 12:07:04 +04:00 |
|
Roman Donchenko
|
dbf02c71b6
|
Merge pull request #1091 from SpecLad:xls-updates
|
2013-07-05 12:00:52 +04:00 |
|
Alexey Spizhevoy
|
dcb049df6a
|
fixed docs
|
2013-07-05 10:16:22 +04:00 |
|
Alexey Spizhevoy
|
2a48f7c035
|
fixed include for Windows
|
2013-07-05 09:44:32 +04:00 |
|
yao
|
88ed74a7ec
|
fix the function name
|
2013-07-05 08:59:21 +08:00 |
|
ozantonkal
|
7e2643abff
|
removed shape files
|
2013-07-04 19:05:56 +03:00 |
|
Roman Donchenko
|
2b44172026
|
xls-report.py: make behaviour more intelligent in case of repeated results
|
2013-07-04 20:01:27 +04:00 |
|
Roman Donchenko
|
0732905cff
|
xls-report.py: write tests in sorted order
|
2013-07-04 20:01:27 +04:00 |
|
Roman Donchenko
|
ea054e2888
|
xls-report.py: made most columns a little wider
|
2013-07-04 20:01:27 +04:00 |
|
Roman Donchenko
|
4e939e2fce
|
xls-report.py: added an option to include data from unrecognized XMLs
|
2013-07-04 20:00:59 +04:00 |
|
ozantonkal
|
4c3d1d583a
|
remove ModelCoefficients, remove showShape methods from viz3d
|
2013-07-04 18:47:52 +03:00 |
|
Roman Donchenko
|
ec1df9f54d
|
Merge pull request #1090 from asmorkalov:android_tbb_downgrade
|
2013-07-04 19:46:53 +04:00 |
|
ozantonkal
|
5bb95c4110
|
remove widget implementation
|
2013-07-04 18:36:26 +03:00 |
|
ozantonkal
|
ecdd8513fd
|
coordinate system widget implementation, update pose fix
|
2013-07-04 18:19:06 +03:00 |
|
ozantonkal
|
03cc439b08
|
cube widget implementation
|
2013-07-04 17:59:11 +03:00 |
|
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.
|
2013-07-04 18:52:52 +04:00 |
|
ozantonkal
|
f07486b563
|
cylinder widget implementation
|
2013-07-04 17:44:41 +03:00 |
|
Roman Donchenko
|
4d45b3e7f9
|
Merge pull request #1089 from SpecLad:contract-violations
|
2013-07-04 18:25:39 +04:00 |
|
alexandre benoit
|
188f889949
|
Merge branch 'master' of code.opencv.org:opencv
|
2013-07-04 16:19:24 +02:00 |
|
Roman Donchenko
|
83fd385bbd
|
xls-report.py: don't eat all errors when reading sheet.conf
|
2013-07-04 18:03:03 +04:00 |
|
ozantonkal
|
f97c3c8b06
|
circle widget and arrow widget implementation
|
2013-07-04 16:54:46 +03:00 |
|
Alexander Mordvintsev
|
3677a66403
|
line realign
|
2013-07-04 17:43:38 +04:00 |
|
Alexey Spizhevoy
|
406f342dc3
|
updated docs
|
2013-07-04 17:41:39 +04:00 |
|
ozantonkal
|
d80a965f97
|
sphere widget implementation
|
2013-07-04 16:32:06 +03:00 |
|
Alexey Spizhevoy
|
027065a5a1
|
removed trailing whitespaces causing warnings
|
2013-07-04 17:31:12 +04:00 |
|
Roman Donchenko
|
a2d576c1bb
|
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
|
2013-07-04 17:24:21 +04:00 |
|
Roman Donchenko
|
4d569732b9
|
Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
|
2013-07-04 17:23:53 +04:00 |
|
Alexey Spizhevoy
|
cc85e86ee7
|
fixed Windows build
|
2013-07-04 17:22:36 +04:00 |
|
ozantonkal
|
3d3e3fd470
|
plane widget implementation
|
2013-07-04 16:15:20 +03:00 |
|
Roman Donchenko
|
0daf4b800a
|
Fix bug: CommandLineParserParams's comparator would fail with equal arguments.
|
2013-07-04 17:09:29 +04:00 |
|
Roman Donchenko
|
4692d4b36e
|
Fix bug: cv::String would break if assigned to itself.
|
2013-07-04 17:06:00 +04:00 |
|