Commit Graph

11130 Commits

Author SHA1 Message Date
peng xiao
5032240c9d Fix ocl gftt file name typo. 2013-07-10 14:51:40 +08:00
Anatoly Baksheev
e4c3416f58 experimental widget casting functionality 2013-07-09 20:16:43 +04:00
Anatoly Baksheev
509a93c7ce minor naming 2013-07-09 19:35:26 +04:00
ozantonkal
200b254bad rearrange widget constructors 2013-07-09 15:18:44 +02:00
Roman Donchenko
2dedfd9762 Merge pull request #1099 from asmorkalov:linux_vcap_fix 2013-07-09 17:13:05 +04:00
ozantonkal
10d955f18b widget2d setcolor implementation 2013-07-09 14:28:55 +02:00
ozantonkal
318b1c00a9 implement assignment operator and copy constructor for all widgets existing 2013-07-09 14:12:49 +02:00
Alexander Smorkalov
f77d1f57ee V4L and V4L2 based Video capture bug fix (Bugfix #3144). 2013-07-09 16:07:55 +04:00
Roman Donchenko
b1f04c5388 Merge pull request #1097 from apavlenko:ocl_tests_fixes 2013-07-09 14:00:38 +04:00
Andrey Pavlenko
fcb4c0e51c fixing working with test data and a small fix for init code
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!
2013-07-09 13:25:21 +04:00
ozantonkal
195d60f4f8 fix widget delete bug 2013-07-09 11:07:21 +02:00
ozantonkal
d324c03b6a initial redesigning widgets 2013-07-09 10:22:12 +02:00
Roman Donchenko
68a992b075 Merge pull request #1096 from SpecLad:merge-2.4 2013-07-09 11:50:19 +04:00
Andrew Senin
aa2ca3aa8f Improve FPS on black and white Ximea cameras 2013-07-09 00:33:39 +04:00
Anatoly Baksheev
061c28cde0 Merge pull request #14 from ozantonkal/implementing_widgets
Implementing widgets
2013-07-08 12:52:18 -07:00
ozantonkal
b50d777985 cloudwidget private implementation for duplicate code, add cv_assert(exists), fix bug point_step bug in CloudNormalsWidget 2013-07-08 21:48:19 +02:00
ozantonkal
cc08149d7c remove redundant statements 2013-07-08 19:05:35 +02:00
ozantonkal
658e4c5e97 set/get/updateWidgetPose implemented, cloudNormals with color 2013-07-08 18:56:13 +02:00
ozantonkal
e76023be96 cloud normals widget implementation 2013-07-08 18:22:51 +02:00
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