mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,658 Commits 6 Branches 126 Tags 3 GiB
29f37fc130
Commit Graph

42 Commits

Author SHA1 Message Date
Roman Donchenko
184ae873d4 Merge pull request #1526 from vpisarev:linedetector_python 2013-10-01 19:49:17 +04:00
Alexander Mordvintsev
0a8d62e5fd createLineSegmentDetectorPtr -> createLineSegmentDetector 2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
f0b050fa88 exposed LineSegemntDetector to python 2013-09-30 14:30:00 +04:00
Nghia Ho
5921c77613 Merge remote-tracking branch 'upstream/master' 2013-09-26 23:08:23 +10:00
Alexander Smorkalov
4b203f7b1a Merge pull request #1470 from IceRage:min_enclosing_triangle 2013-09-26 16:28:54 +04:00
Ovidiu Parvu
e324446c70 Changed the signature of the minEnclosingTriangle function such that it returns the area automatically. Moreover, the overloaded function was no longer required so it was removed. Sample code, documentation and unit tests were updated correspondingly. 2013-09-19 16:22:30 +01:00
Nghia Ho
8e8ff4dd33 Merge remote-tracking branch 'upstream/master' 2013-09-19 23:58:19 +10:00
Ovidiu Parvu
8bada4c751 Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''. 
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.
 2013-09-12 23:47:48 +01:00
Ovidiu Parvu
4fce8e6b0e Changed the semantics of the minEnclosingTriangle function such that: 
1. The function receives a set of points as input instead of a convex polygon with more than three vertices
2. The convex hull P is computed inside the function
3.1. If the number of vertices of P is greater than three then the algorithm which was implemented before executes
3.2. Otherwise the vertices of the triangle are picked from the vertices of the given polygon and the area computed
 2013-09-12 13:29:10 +01:00
Ovidiu Parvu
510ad8e779 - Changed the type of the minEnclosingTriangle function parameters by using proxy classes InputArray/OutputArray instead of std::vector<T> 
- Adapted the source code to accommodate this change
 2013-09-12 10:11:38 +01:00
Ovidiu Parvu
e6b58c4e79 - Added the minEnclosingTriangle function declaration to the imgproc header 
- Added the source code for the function in the separate file min_enclosing_triangle.cpp
 2013-09-11 18:07:19 +01:00
Roman Donchenko
242e4254f3 Merge pull request #1427 from SpecLad:merge-2.4 2013-09-10 18:28:20 +04:00
Roman Donchenko
95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp
 2013-09-10 11:30:19 +04:00
Roman Donchenko
4ee5599d4b Merge pull request #1381 from 23pointsNorth:master 2013-09-09 19:53:56 +04:00
Nghia Ho
0e06465a23 Merge remote-tracking branch 'upstream/master' 2013-09-09 23:23:12 +10:00
Roman Donchenko
254d4ae429 Boring changes - imgproc. 2013-09-05 18:26:43 +04:00
Daniel Angelov
b5e1eb7d48 Removed IOArray constness. 2013-09-04 14:59:57 +03:00
Nghia Ho
cc15898353 Merged with HEAD and removed C interface to rotatedRectangleIntersection 2013-09-04 20:45:10 +10:00
Daniel Angelov
9d78b8003e Update on LSD no to use any Mat* (IOArrays instead). 
Updated to new license.
 2013-08-31 13:46:24 +03:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
 2013-08-19 19:02:36 +04:00
Nghia Ho
2c9c4188ae Merge https://github.com/Itseez/opencv 2013-08-14 22:38:39 +10:00
Roman Donchenko
7992402ecf Merge pull request #1149 from jet47:generalized-hough-refactoring 2013-08-14 13:26:24 +04:00
Nghia Ho
3fcdbbe734 Merge https://github.com/Itseez/opencv 2013-07-30 23:58:10 +10:00
Nghia Ho
a40f217a38 changed from isnormal to isfinite, the prev ignored zero 2013-07-28 01:06:55 +10:00
Nghia Ho
e2f00ce846 New intersection function for rotated rectangles 2013-07-28 00:12:24 +10:00
Roman Donchenko
31de2833b4 Replace "const InputArray" with "InputArray". 
InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.
 2013-07-26 14:52:56 +04:00
Daniel Angelov
6fa4834f31 Update on the class. Edited tests and samples. 2013-07-22 00:55:29 +03:00
Daniel Angelov
965b3759b1 Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups. 2013-07-21 01:31:51 +03:00
Vladislav Vinogradov
7b87d72d80 refactored generalized hough (both CPU and GPU): 
removed set/get methods from Algorithm (implement owns)
removed GHT_* enumeration
 2013-07-18 15:17:33 +04:00
Daniel Angelov
694d9ff2eb LSD enum now anonymous. 2013-07-15 23:28:19 +03:00
Daniel Angelov
d35601209e Added define guard for ln10. Fixed some warnings. 2013-07-14 14:29:56 +03:00
Daniel Angelov
22c8010b2d Added needed header, changed macro name. 2013-07-14 12:56:22 +03:00
Daniel Angelov
6bd5e12be3 Added a sample to show usage of the class. 2013-07-13 04:11:27 +03:00
Daniel Angelov
e51e00ac5f Added LSD accuracy tests. 2013-07-13 04:09:28 +03:00
Daniel Angelov
5350a2f1d9 Added Line Segmen Detector. 2013-07-13 00:21:02 +03:00
abidrahmank
37f4e400e4 Added cv2.boxPoints() functionality to Python bindings (Feature #2023) 
http://www.code.opencv.org/issues/2023

eg:

In [3]: box = ((10,10),(5,5),0)

In [4]: cv2.boxPoints(box)
Out[4]:
array([[  7.5,  12.5],
       [  7.5,   7.5],
       [ 12.5,   7.5],
       [ 12.5,  12.5]], dtype=float32)
 2013-06-24 12:13:59 +05:30
Andrey Kamaev
c98c246fc2 Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
Andrey Kamaev
288a0634c2 Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
Andrey Kamaev
2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Andrey Kamaev
a1c456b7c3 Extract common base header for C and C++ APIs 2013-03-15 10:38:38 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up 
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
 2013-03-13 17:26:56 +04:00