Commit Graph

11108 Commits

Author SHA1 Message Date
ozantonkal
ec756afe87 trajectorywidget display modes are combined with & instead of | 2013-07-25 16:08:23 +02:00
ozantonkal
64cdd82146 trajectory widget constructor with field of view 2013-07-25 15:08:45 +02:00
Jan Starzynski
d6b86d43c9 removed declaration of throwJavaException 2013-07-25 14:53:22 +02:00
Alexander Mordvintsev
57bd485119 compute method for Feature2D 2013-07-25 16:22:31 +04:00
Jan Starzynski
70930a30a1 refactored throwJavaException() and removed useless returns 2013-07-25 13:36:27 +02:00
Alex Leontiev
52b250f466 Minor fixes
Fixing failed build.
2013-07-25 14:30:20 +03:00
ozantonkal
7d458e852e trajectory widget display options: display path, display frames, display both 2013-07-25 10:56:54 +02:00
ozantonkal
aa2594c06c fix aspect_ratio computation from fovs, add casting for camerapositionwidget, trajectorywidget 2013-07-25 10:23:24 +02:00
Roman Donchenko
8afb7a40c6 Merge pull request #1159 from lluisgomez:scene_text_detection_NM 2013-07-25 12:13:49 +04:00
Roman Donchenko
98d36a4037 Merge pull request #1171 from SpecLad:drop-legacy-options 2013-07-25 12:05:36 +04:00
Roman Donchenko
4e1e0c9ee3 Merge pull request #1180 from nghiaho12:master 2013-07-25 12:04:09 +04:00
Roman Donchenko
be8b3687f4 Merge pull request #1184 from apacha:Descriptor_Docu_FREAK_added_2 2013-07-25 12:00:55 +04:00
Alexander Pacha
0b15cfd48c Added FREAK-descriptor extractor to documentation.
Previously it was missing.
Ordered all descriptors by year of first publication.
2013-07-25 16:40:09 +12:00
Jan Starzynski
925e4eec98 removed multiplied code for exception handling 2013-07-24 17:27:03 +02:00
Nghia Ho
eb2720a908 missing fclose when returning early 2013-07-24 23:53:18 +10:00
Roman Donchenko
0e4882aa16 Merge pull request #1169 from asmorkalov:winrt_tbb_dbg_wrn_fix 2013-07-24 16:08:17 +04:00
Roman Donchenko
45f7c83da4 Merge pull request #1119 from 23pointsNorth:lsd 2013-07-24 13:50:11 +04:00
Roman Donchenko
b2d359b6ac Merge pull request #1170 from SpecLad:merge-2.4 2013-07-24 13:45:33 +04:00
ozantonkal
769512db2d move image copying structure to viz3d_impl: ConvertToVtkImage 2013-07-24 10:32:21 +02:00
ozantonkal
952029a47b GridImpl structure to shorten grid widget implementation 2013-07-24 10:13:01 +02:00
ozantonkal
6e5a712f6e Gridwidget with plane coefficients 2013-07-24 10:02:33 +02:00
Alexander Smorkalov
908039c658 Warning suppresion for TBB on WinRT added. 2013-07-24 09:21:30 +04:00
ozantonkal
40b50755d3 add const keywords to gridwidget constructor 2013-07-23 15:46:14 +02:00
ozantonkal
4d70671231 intial implementation of frustum + image (the color of the frustum is currently dependent on the first pixel of the image) 2013-07-23 15:43:23 +02:00
lluis
c4f88b0687 removed some unnecessary ERStat members as they are easily computable from others 2013-07-23 15:04:01 +02:00
lluis
43e7e6e475 removed extra cv:: scope qualifiers for better readability 2013-07-23 14:37:45 +02:00
lluis
2087d4602b using Rect for storing the bounding box instead of an integer array 2013-07-23 13:58:52 +02:00
Roman Donchenko
48e31fd202 Merge pull request #1168 from StevenPuttemans:feature_2753 2013-07-23 11:54:40 +04:00
StevenPuttemans
194af062ff Adapted the reference underscore to link properly 2013-07-23 09:49:09 +02:00
StevenPuttemans
a92feafc49 Fixed bug 3166 - added paper reference to stardetector code 2013-07-23 08:49:25 +02:00
lluis
ca6b30a568 using explicit keyword in the ERStat constructor for safe contruction 2013-07-23 00:24:17 +02:00
ozantonkal
f9938da67d image 3d widget with position, normal, up_vector 2013-07-22 17:18:19 +02:00
Roman Donchenko
abe4219256 Drop the legacy CMake options.
3.0 seems like an appropriate time to do that.
2013-07-22 18:49:38 +04:00
ozantonkal
d0bd344a42 image 3d widget use texture instead of imageactor for more flexibility (such as resizing) 2013-07-22 16:48:17 +02:00
Roman Donchenko
3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
ozantonkal
27f5cd2afd overlay image widget constructor with Rect 2013-07-22 16:12:22 +02:00
StevenPuttemans
7968789544 Made change to install in windows guide, showing only difference between VS2010 and VS2012 2013-07-22 15:16:22 +02:00
ozantonkal
540f9a67f3 remove unnecessary declaration 2013-07-22 15:14:33 +02:00
ozantonkal
c0f44ca421 shorten Trajectory widget implementation 2013-07-22 15:03:28 +02:00
ozantonkal
5af739dfc1 plane widget size fix 2013-07-22 14:34:44 +02:00
ozantonkal
16c8c98895 trajectory widget with frustums 2013-07-22 14:11:06 +02:00
Daniel Angelov
ae93a3e681 The accurate LineSegmentDetector object. 2013-07-22 15:08:23 +03:00
Daniel Angelov
26847f92b3 Fixed the sample. 2013-07-22 14:46:34 +03:00
Roman Donchenko
38a0b47b2f Merge pull request #1165 from vpisarev:24_ipp 2013-07-22 15:34:13 +04:00
ozantonkal
f3b228c91f initial implementation of trajectory widget 2013-07-22 12:53:19 +02:00
Roman Donchenko
ef91d7e883 Merge pull request #1153 from abidrahmank:bgdGMG_docs 2013-07-22 14:52:36 +04:00
Daniel Angelov
982ccd784e Added the update on the sample. 2013-07-22 13:49:33 +03:00
Vadim Pisarevsky
8b6afd697d added call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin) 2013-07-22 14:20:13 +04:00
yao
3d3e9ab635 Fix the problem of haar caused by merge 2013-07-22 17:53:56 +08:00
Roman Donchenko
bb15e735b8 Merge pull request #1161 from SpecLad:xls-comp-bug 2013-07-22 13:28:29 +04:00