Commit Graph

10298 Commits

Author SHA1 Message Date
lluis
6ef1d456dd fixed rebase conflicts 2013-09-06 14:00:11 +02:00
Roman Donchenko
2de8487e58 Fixed a few tests that use uninitialized inputs. 2013-09-06 15:53:42 +04:00
Vladislav Vinogradov
b7eff94137 fixed compilation issues with new Ptr 2013-09-06 15:52:07 +04:00
Vladislav Vinogradov
0c7663eb3b Merge branch 'master' into gpu-cuda-rename
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
Roman Donchenko
f88d8b9545 Merge pull request #1405 from SpecLad:retina-ocl-warn 2013-09-06 15:10:06 +04:00
lluis
512111af9c removed blank line at EOF 2013-09-06 12:32:10 +02:00
lluis
1cc6502db3 removed unnecessary commented block 2013-09-06 12:32:10 +02:00
lluis
04913f5af7 removed trailing whitespaces 2013-09-06 12:32:10 +02:00
lluis
b9a5e919e2 better parameter settings for the ERFilter sample 2013-09-06 12:31:49 +02:00
lluis
15511bff40 better classifiers performance by training them with a new dataset of "manually" selected regions 2013-09-06 12:31:49 +02:00
lluis
f4d01175b8 fixed a bug in the calculation of the number of inflexion points feature 2013-09-06 12:31:49 +02:00
lluis
765921cc25 fixed a typo error in the default min_Probability param of CreateERFilterNM2 2013-09-06 12:30:22 +02:00
lluis
dba336c0e3 fixed a bug in the non-max-suppression filter procedure 2013-09-06 12:27:19 +02:00
ilya-lavrenov
27947474ec fixed data path 2013-09-06 13:25:56 +04:00
Roman Donchenko
7d62fdc62c GPU resize: removed a few parameter names to avoid unused parameter warnings. 2013-09-06 12:46:58 +04:00
Roman Donchenko
439e90f4f4 retina_ocl.cpp: removed two unused arrays. 2013-09-06 12:34:37 +04:00
Roman Donchenko
af594c8e44 retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning. 2013-09-06 12:33:54 +04:00
Roman Donchenko
bfd84dc5d5 Merge pull request #1402 from SpecLad:ocl-samples 2013-09-06 12:20:03 +04:00
Roman Donchenko
0f4089f3c3 Merge pull request #1404 from ilya-lavrenov:stdcall 2013-09-06 12:09:59 +04:00
Roman Donchenko
bad927325f Merge pull request #1281 from SpecLad:the-smartest-pointer 2013-09-06 11:53:34 +04:00
hbristow
74accbd969 Added <algorithm> to mxarray.hpp, which seems to be needed explictly by some compilers 2013-09-06 16:42:32 +10:00
Jin Ma
172242a94e Revised performance test according to the feedback of the community. 2013-09-06 13:39:41 +08:00
hbristow
6964f6aacc Removed unused Dynamic from matlab namespace - clashing with Eigen 2013-09-06 15:26:05 +10:00
Ozan Tonkal
5eed0d6bef remove common.h include from widgets.hpp 2013-09-05 21:03:40 +02:00
Ozan Tonkal
f99e874704 tutorial: creating_widgets code 2013-09-05 21:03:40 +02:00
Ozan Tonkal
b60894c1dd launching viz tutorial 2013-09-05 21:03:40 +02:00
Ozan Tonkal
31501ebf4f replace tabs by spaces 2013-09-05 21:03:39 +02:00
Ozan Tonkal
a5b75769a3 initial documentation 2013-09-05 21:03:39 +02:00
Ozan Tonkal
2822845ba6 set get RenderingProperty id comes first 2013-09-05 21:03:39 +02:00
Ozan Tonkal
9d4fe6984b remove setWindowName method to avoid complications 2013-09-05 21:03:39 +02:00
Ozan Tonkal
21be9796ae comments on widgets where constructors might be confusing 2013-09-05 21:03:39 +02:00
ozantonkal
2705113bc4 remove common.cpp, remove commented code in common.h 2013-09-05 21:03:39 +02:00
ozantonkal
ffbb5e9524 resetCamera, resetViewpoint in Viz3d 2013-09-05 21:03:39 +02:00
ozantonkal
4aa61dee50 minor refactoring interactor_style 2013-09-05 21:03:39 +02:00
ozantonkal
af8a918e04 fix minor bug, minor cleaning, cv_assert with messages 2013-09-05 21:03:39 +02:00
ozantonkal
69f135ec57 fix memory leak in viz3d 2013-09-05 21:03:39 +02:00
ozantonkal
6c0c217562 removed reference counter in widgets, fixed memory leak 2013-09-05 21:03:39 +02:00
ozantonkal
4b443059ec reverted widget reference count in order to avoid memory leak 2013-09-05 21:03:39 +02:00
ozantonkal
8007e07ad2 load mesh function is finalized: color range is always 0-255 and RGB due to vtkPLYReader limitations 2013-09-05 21:03:39 +02:00
ozantonkal
e4b13f2ef0 update reader after setting file name 2013-09-05 21:03:39 +02:00
ozantonkal
3da7dd9849 fix yellow and magenta color bgr codes 2013-09-05 21:03:39 +02:00
ozantonkal
9086cf5d79 remove unused includes and libraries from linking 2013-09-05 21:03:39 +02:00
ozantonkal
3038ffb886 setDesiredUpdateRate implementation in Viz3d 2013-09-05 20:56:33 +02:00
ozantonkal
ed0162ad0b remove reference counting in widgets 2013-09-05 20:56:33 +02:00
ozantonkal
08917908f3 remove eigen dependency 2013-09-05 20:56:33 +02:00
ozantonkal
f98614ece0 remove cloudactormap, shapeactormap. only vtkProp is stored and view transformation can be obtained using GetUserMatrix of vtkProp3D 2013-09-05 20:56:33 +02:00
ozantonkal
f6e1a093cd implement window relevant methods in Viz3d 2013-09-05 20:56:33 +02:00
ozantonkal
4f416352e1 implemented actor representation methods in viz3d 2013-09-05 20:56:33 +02:00
ozantonkal
cf36b8f817 rendering properties in Widget and Viz3d 2013-09-05 20:56:33 +02:00
ozantonkal
b032b4dded move frompolyfile to widget class as static method, remove addpolygon and its alikes 2013-09-05 20:56:33 +02:00