mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-14 17:29:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,357 Commits 6 Branches 127 Tags 3 GiB
869016d8b1
Commit Graph

488 Commits

Author SHA1 Message Date
Vadim Pisarevsky
1eae455acb fixed build warnings from VS; hopefully, fixes Android build too 2012-12-15 23:14:50 +04:00
Vadim Pisarevsky
2a42960ff2 Merge branch 'master' of https://github.com/nevion/opencv into cc 2012-12-15 21:45:55 +04:00
Jason Newton
e70b3ef598 use a ltype parameter to determine result Label image type; export stats with differening types over different outputarrays 2012-12-08 23:09:14 -08:00
Jason Newton
00bdca7684 A few changes to comply with upstream requirements for merge. 
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.

-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
 2012-11-27 02:31:38 -08:00
Ilya Lavrenov
5225672dc0 added edge-aware demosaicing and bayer to bgra conversion 2012-11-26 16:17:43 +04:00
Jason Newton
d5aa679d3f adjust output type to return int32... it should at least be unsigned but this breaks python bindings; 
remove non-8bit input type support, not worth the binary size
 2012-11-22 21:26:52 -08:00
Jason Newton
85880397c4 connectedcomponents: use opencv integral types, add to docs, fix up things for a python export 2012-11-05 12:02:53 -08:00
Jason Newton
4c0cb2576d connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version 2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b connectedComponents: warning free version 2012-11-05 08:10:29 -08:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
ed51162568 Fix binary compatibility of Java wrappers 2012-10-17 02:09:37 +04:00
Andrey Kamaev
0442bca235 Revert "partially recovered binary compatibility (ticket #2415)" 
This reverts commit 94b97b7a63.
 2012-10-16 19:37:12 +04:00
Andrey Kamaev
64b56d7018 Revert "remaining C-style planar subdivisions data structures are moved to legacy" 
This reverts commit 4aaaef5967.

Conflicts:
    modules/imgproc/include/opencv2/imgproc/types_c.h
    modules/legacy/include/opencv2/legacy/legacy.hpp
 2012-10-16 15:13:00 +04:00
Andrey Kamaev
58f31819cc Return drawContours back to imgproc 
This partly reverts commit 6ca618277c.
 2012-10-15 18:12:33 +04:00
Vadim Pisarevsky
94b97b7a63 partially recovered binary compatibility (ticket #2415) 2012-10-08 17:06:05 +04:00
Vladislav Vinogradov
98c92f196e added Generalized Hough implementation 2012-09-10 16:49:40 +04:00
Andrey Pavlenko
a72f4474b4 fixing bug #1987(android keeps RGBA in alpha pre-multiplied form, Mat <-> Bitmap should handle this correctly) 2012-06-29 15:38:10 +00:00
Vadim Pisarevsky
87d1731714 added synonym CV_COMP_HELLIGNER for CV_COMP_BHATTACHARYAA to reflect the real formula used (bug report #2073) 2012-06-22 15:12:19 +00:00
Vadim Pisarevsky
0c65ea976a added the optional output maxima value to phaseCorrelate (patch #2071 by Robert Huitl) 2012-06-22 13:34:03 +00:00
Andrey Kamaev
05de6302fd Fixed documentation: corrected parameter names 2012-05-29 10:36:19 +00:00
Andrey Kamaev
6ca618277c More fixes for documentation. 2012-05-28 20:11:38 +00:00
Andrey Kamaev
4aaaef5967 remaining C-style planar subdivisions data structures are moved to legacy 2012-05-28 13:57:45 +00:00
Andrey Kamaev
eb2f1f81ed Fixed hundreds of documentation problems 2012-05-28 07:36:14 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Andrey Kamaev
d95721107c Fixed typo. 2012-03-31 17:34:24 +00:00
Andrey Kamaev
124ceb96a7 #1732 Added yuv420p to RGB conversion. Thanks to Robert Abel. 2012-03-31 15:33:03 +00:00
Vadim Pisarevsky
7fb8e9d328 added borderType to pyrDown, pyrUp & buildPyramid (patch #925) 2012-03-30 16:58:24 +00:00
Andrey Pavlenko
aea24ffcd5 #796, #1701 fixing doc vs code arg-s naming consistency 2012-03-30 14:22:34 +00:00
Vadim Pisarevsky
beb7fc3c92 a LOT of obsolete stuff has been moved to the legacy module. 2012-03-30 12:19:25 +00:00
Vadim Pisarevsky
e36ad50825 added cv::convexityDefects (ticket #796) 2012-03-29 19:42:47 +00:00
Vadim Pisarevsky
e8fab91d51 added DIST_LABEL_PIXEL labelType to distanceTransform, ticket #1641 (thanks to Mikhail Matrosov for the patch) 2012-03-27 09:06:21 +00:00
Vadim Pisarevsky
f196dd5ff7 preliminary version of a multi-level findcontours 2012-03-24 20:03:07 +00:00
Andrey Pavlenko
20cceb8fdf moving the rest of inpaint() to the 'photo' module, temporary disabling Java test for it, adding 'photo' to Java API 2012-03-16 15:11:56 +00:00
Vadim Pisarevsky
957e80abbd lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template. 2012-03-15 14:36:01 +00:00
Andrey Pavlenko
36890cc959 (#1636) Java API: adding undistortPoints() support and smoke test; minor improvements in Java stuff 2012-03-14 07:37:48 +00:00
Andrey Kamaev
e426dfc396 Fixed #1613: removed YUV420i color conversion constants 2012-02-21 15:08:03 +00:00
Vadim Pisarevsky
53c39a7a53 added getGaborKernel function 2012-02-06 01:09:54 +00:00
Vadim Pisarevsky
00a58c9af8 fixed bug #1422 (thanks to jondo for the patch) 2012-01-29 14:31:10 +00:00
Vadim Pisarevsky
4f86af7e16 fixed bug #1531. added separate distanceTransformWithLabels function that returns labels, since normally the labels are not needed. 2012-01-25 12:17:59 +00:00
Vadim Pisarevsky
04c0783b2f applied patch by Will Lucas; improved separable filter performance (in particular cv::GaussianBlur) on 16s images (for [much] faster SIFT) 2012-01-23 12:14:46 +00:00
Andrey Kamaev
c377804ee8 Refactored YUV420 to RGB/BGR/RGBA/BGRA conversion 2012-01-16 14:38:07 +00:00
Vadim Pisarevsky
2e9f5c434b added improved ORB implementation, convex-convex polygon intersection, eigen2x2 low-level function ... 2011-11-08 12:01:49 +00:00
Vadim Pisarevsky
65e036fe6d fixed bug #1368 2011-09-27 15:34:39 +00:00
Vadim Pisarevsky
3535aacc23 fixed bug #1389 2011-09-27 15:17:00 +00:00
Andrey Pavlenko
f2da701723 cvtColor: dst channels number default is set to 4 for RGBA/BGRA cases; added new codes for yuv420 to RGBA/BGRA. 2011-09-06 08:35:31 +00:00
Vadim Pisarevsky
32ed1bf858 added phaseCorrelate function by Will Lucas. 2011-09-05 07:57:18 +00:00
Vadim Pisarevsky
c9ed7fee34 fixed C++ implementation of Delaunay triangulation and moved it from sample to imgproc. 2011-08-10 10:28:01 +00:00
Vadim Pisarevsky
f85b9754e0 fixed Vec*scalar operations, fixed minEnclosingCircle Python interface. 2011-08-01 12:01:43 +00:00
Andrey Kamaev
ac7e16fdf6 Fixed camera output format handling 2011-07-25 12:32:33 +00:00
Vadim Pisarevsky
1badec0b2d eliminated opencv_extra_api.hpp (all the functionality is moved to the regular OpenCV headers) 2011-07-18 16:31:30 +00:00
Vadim Pisarevsky
16ba62dcd5 added COLOR_... enumeration to imgproc.hpp and EVENT_... enumeration to highgui.hpp 2011-07-18 13:05:34 +00:00
Vadim Pisarevsky
f2e1a64c1b fixed "import cv" in the new python samples. corrected Python bindings to match the documentation and vice versa (NOTE: in cv2.stereoCalibrate the parameter ordering has been changed) 2011-07-16 09:35:56 +00:00
Vadim Pisarevsky
2dea07f9f8 repaired Python bindings for functions using InputOutputArray 2011-07-14 14:13:10 +00:00
Vadim Pisarevsky
5649f35757 some more bugfixed in 2.3 propagated to trunk 2011-07-07 11:43:21 +00:00
Vadim Pisarevsky
c37e063914 removed serveral CV_EXPORTS_AS() to make Python function names in cv2 the same as in C++. 2011-06-18 10:03:01 +00:00
Vadim Pisarevsky
20aca7440f a lot of small corrections to bring down the number of undocumented functions, reported by the script; added em.cpp sample 2011-06-09 01:16:45 +00:00
Vadim Pisarevsky
2d2b8a496e renamed "None()" to "noArray()" to avoid conflicts with X11 (ticket #1122) 2011-06-08 06:55:04 +00:00
Vadim Pisarevsky
0c877f62e9 replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()). 2011-06-06 14:51:27 +00:00
Andrey Kamaev
cdda5ec491 YUV420i to RGB conversion is added to cvtColor 2011-06-04 18:15:52 +00:00
Vadim Pisarevsky
abeeb40d46 a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc. 2011-04-17 13:14:45 +00:00
Vadim Pisarevsky
061b49e0b2 reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine. 2011-02-09 20:55:11 +00:00
Vadim Pisarevsky
51d039945a fixed cv::CHAIN_APPROX_* definitions (ticket #755) 2010-12-12 20:46:06 +00:00
Vadim Pisarevsky
fcdce4edcb fixed border processing bayer2rgb & bayer2gray; made the test "color-bayer" pass; renamed CV_Bayer*2Gray -> CV_Bayer*2GRAY for consistency 2010-12-11 10:43:32 +00:00
Vadim Pisarevsky
da293ee3d9 SSE2 optimization for Bayer->RGB; added Bayer->Gray with SSE2 optimization; corrected some bugs noted in the yahoogroups forum 2010-12-10 19:06:38 +00:00
Vadim Pisarevsky
6a15ff8d13 added cvSave(contours) to the contours demo; added rational model demonstration to stereo_calib; fixed formatting in imgproc/types_c.h 2010-12-03 19:09:06 +00:00
Vadim Pisarevsky
70d2c57e35 moved estimateAffine3D declaration from imgproc to calib3d, where it is really implemented (ticket #705) 2010-11-29 20:51:02 +00:00
Vadim Pisarevsky
54ef4c08c2 moved some old stuff to the legacy module; merge "compat_c.h" headers and moved to the legacy as well. moved implementation of many non-critical/obsolete inline functions and methods to .cpp to improve Opencv build time 2010-11-26 17:58:20 +00:00
Vadim Pisarevsky
59e2afe4d2 fixed the ordering of parameters in PyArg_ParseTupleAndKeywords, added correct Ptr<CvDTreeSplit>::delete_obj() (ticket #406) 2010-11-25 23:16:32 +00:00
Vadim Pisarevsky
f5e5b677c9 added hconcat & vconcat functions for joining matrices; moved some inline functions out of the headers; fixed several bugs in documentation; removed MatND from docs 2010-11-23 16:39:20 +00:00
Ethan Rublee
89c4bc54d9 fix little warning - opencv2/imgproc/types_c.h:235: warning: comma at end of enumerator list 2010-11-23 00:06:33 +00:00
Vadim Pisarevsky
96ad3b57b8 LANCZOS4 interpolation constant added to C interface 2010-11-18 22:04:32 +00:00
Vadim Pisarevsky
e15a2ea95a fixed remap with transparent border (ticket #582) 2010-11-10 21:14:57 +00:00
Vadim Pisarevsky
5a53d82e30 fixed most of the failures in opencv_test 2010-11-06 14:56:01 +00:00
Vadim Pisarevsky
5b6a755719 almost finished Python wrappers 2010-11-02 17:58:22 +00:00
Vadim Pisarevsky
893fb90b87 extended Python bindings; not merged into cv.cpp yet; and many of the helper functions, like pyopencv_to_*, pyopencv_from_* etc. are still missing 2010-10-29 13:09:49 +00:00
Vadim Pisarevsky
83f6085773 added more helper macros to the function declarations, to assist the Python wrapper generator. Fixed memleak in Mat::operator()(Range,Range) and the related functions (Mat::row, Mat::col etc.) 2010-10-27 18:26:39 +00:00
Vadim Pisarevsky
1b1eab8e67 added helper macros to the function declarations 2010-10-16 20:34:34 +00:00
Vadim Pisarevsky
bc4532bd07 added initWideAngleProjMap() function 2010-08-06 10:20:49 +00:00
Maria Dimashova
cba926a428 added c++ interface for cvPyrMeanShiftFiltering; added sample on meanshift segmentation 2010-07-28 16:41:12 +00:00
Vadim Pisarevsky
2f2f06b925 rewrote color conversion functions; added sRGB<->CIE Lab/Luv conversion; added RGB<->YUV conversion; improved [s]RGB->Lab conversion speed 2010-07-27 14:10:14 +00:00
Vadim Pisarevsky
f48bd3d281 added VNG demosaicing algorithm (ticket #466) 2010-07-20 15:51:32 +00:00
Vadim Pisarevsky
08cba33f9d fixed some more MSVC2010 warnings 2010-07-17 10:35:17 +00:00
Vadim Pisarevsky
266c4642ea doxygenated opencv_video & opencv_calib3d modules (C++ part only) 2010-05-25 15:59:48 +00:00
Vadim Pisarevsky
4632d65889 doxygenated core and imgproc modules (C++ API only) 2010-05-25 14:57:10 +00:00
Vadim Pisarevsky
33447e0bba fixed mixed-type exp and log functions, used in HMMs (thanks to V. Mityaev) 2010-05-21 12:07:00 +00:00
Vadim Pisarevsky
4a073bd951 fixed build on Linux 2010-05-12 07:33:21 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00