mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-11 22:59:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,412 Commits 6 Branches 127 Tags 3 GiB
276459e57e
Commit Graph

240 Commits

Author SHA1 Message Date
abidrahmank
96c1df14f4 CLAHE Python bindings 2013-08-13 19:51:32 +05:30
Alexander Shishkov
c4fb0e9dbb few changes for compilation 2013-08-06 15:41:32 +04:00
Alexander Shishkov
6df203c449 Fixes for Linux compilation, small changes 2013-08-03 01:45:20 +04:00
Alexander Mordvintsev
25b9ac18e6 fixed Bug #3143 - flann 'not implemented' error 2013-07-26 17:59:38 +04: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
Roman Donchenko
28a5c127ea Made the Python bindings not use deprecated NumPy 1.7 API. 2013-07-16 14:33:15 +04:00
abidrahmank
5d863f7516 drawMatches python bindings 2013-07-11 09:28:37 +05:30
Gabe Schwartz
bb209193c9 Updated usage of METH_X definitions for python 3. 
Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
fb9781b97b Updated cv2.cpp to support Python 3 API. 
Added a header with defines to enable the module to compile with either
python 2 or 3 without changes.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
931ebab822 Updated generator and parser to support Python 3. 2013-06-13 18:39:47 -04:00
Andrey Kamaev
b8ed00bd64 Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
Egbert van der Wal
dc6a144396 add (optional) index argument to RetrieveFrame method 2013-05-04 17:18:12 +02:00
Andrey Kamaev
298ccf6487 Turn pyopencv_to and pyopencv_from into templates 
This protects from unwanted implicit conversions between types at compile time.
 2013-04-13 01:02:57 +04:00
Andrey Kamaev
f886651cf0 Drop old python samples and tests 2013-04-12 19:37:40 +04:00
Andrey Kamaev
b2ba8b9969 Drop old python interface 2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad Merge branch '2.4' 2013-04-12 15:35:38 +04:00
Andrey Kamaev
5e048d1fa5 Move C API of opencv_objdetect to separate file 
Also move cv::linemod to own header
 2013-04-12 14:37:01 +04:00
Roman Donchenko
57d4c86b2b Fixed the shebang lines on the Python scripts. 
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
 2013-04-11 18:37:23 +04:00
Andrey Kamaev
199a35a105 Move C API of opencv_video to separate file 2013-04-11 17:38:33 +04:00
Andrey Kamaev
b0e6606b98 Cleanup core module API 
* Drop some low level API
* Remove outdated overloads
* Utilize Input/OutputArray
 2013-04-09 13:36:32 +04:00
Andrey Kamaev
69648f0a6f Make photo.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Dustin Spicuzza
64b5784c0b Catch exceptions when large allocations fail 2013-04-05 00:43:10 -04:00
Andrey Pavlenko
75ea10e6ff fix for #2806 (missing 'nu03' field of moments) 2013-04-02 12:14:43 +04:00
Andrey Kamaev
715fa3303e Move cv::Mat out of core.hpp 2013-04-01 15:24:34 +04:00
Andrey Kamaev
5e7ab8baf3 Move cv::Scalar_ to types.hpp 2013-04-01 15:24:33 +04:00
Andrey Kamaev
20534c9beb Merge pull request #692 from vpisarev:refactor_calib3d_stereo 2013-03-26 18:38:16 +04:00
Vadim Pisarevsky
44157c421f fixed python test failures (modified stereo correspondence test to use cv2.* stuff), fixed docs 2013-03-25 00:42:46 +04:00
Andrey Kamaev
be7bbe3aa9 Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
Andrey Kamaev
707d3e0a62 Python wrapper is adapted for cv::String 2013-03-22 22:14:30 +04:00
Andrey Kamaev
82d7292ee7 Merge pull request #680 from vpisarev:c2cpp_video_take2 2013-03-22 19:34:53 +04:00
Vadim Pisarevsky
40dd25d6c2 restored CV_EXPORTS_W in the background subtraction classes 2013-03-22 01:29:33 +04:00
Andrey Kamaev
bbae05413d Merge pull request #682 from vpisarev/python_str_fix 
repaired std::string handling
 2013-03-21 08:57:39 -07:00
Vadim Pisarevsky
4e1619d8ee repaired std::string handling 2013-03-21 11:30:38 +04:00
Vadim Pisarevsky
07e0f7bf59 refactored video module; use the new-style algorithms now 2013-03-20 19:51:49 +04:00
Andrey Kamaev
89356ff16d Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
Andrey Kamaev
e75df56317 Unified handling of InputOutputArrays in Python wrapper generator 
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.

As result following python functions changes signatures in non-trivial way:

* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate

And the following functions become return their modified inputs as a return
value:

* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
 2013-03-15 17:44:49 +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
Andrey Kamaev
9b7dfd677d Merge branch '2.4' 2013-03-11 18:50:19 +04:00
Andrey Kamaev
980fc93b4d Fix clang + ccache build warnings 2013-03-11 18:41:22 +04:00
Andrey Kamaev
2a6fb2867e Remove all using directives for STL namespace and members 
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
 2013-02-25 15:04:17 +04:00
cuda-geek
f52ce6529b Merge pull request #322 from cuda-geek:training 2013-02-01 18:45:12 +04:00
marina.kolpakova
cc538ddfa6 changes related with code review 2013-02-01 17:47:05 +04:00
Andrey Kamaev
61079547f0 Merge branch '2.4' 2013-02-01 14:59:40 +04:00
marina.kolpakova
f7ac73998a code review fixes 2013-02-01 14:36:06 +04:00
marina.kolpakova
f3227c3f1a merged ICFPreprocessor and Channels -> ChannelFeatureBuilder 2013-02-01 14:36:06 +04:00
Vadim Pisarevsky
79e278c008 applied patch #2587 2013-01-31 16:19:20 +04:00
Andrey Kamaev
78a338159d Merge branch '2.4' 2013-01-29 14:17:13 +04:00
Vadim Pisarevsky
4044fbcb33 hopefully fixed handling of 'long' Python type in OpenCV bindings (bug #2193). added the corresponding test 2013-01-28 21:03:59 +04:00
Vadim Pisarevsky
2320ec76b4 Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658. Added tests for #2611, #2505, #2658 2013-01-28 20:45:00 +04:00
Vadim Pisarevsky
cd46a674d1 applied patch #2611 that also likely fixes #2505 2013-01-28 18:30:20 +04:00
Andrey Kamaev
f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Vadim Pisarevsky
f14b7af5ac changed diagnostic from "warning" to "note" in the python wrapper generator, to suppress some noise in opencv utilities 2013-01-21 15:00:32 +04:00
Andrey Kamaev
084b1c7969 Merge branch 2.4 2013-01-11 15:45:23 +04:00
Andrey Kamaev
b401c6a0c3 Fix discrepancies between function signatures in headers and documentation 2012-12-26 18:24:50 +04:00
Andrey Kamaev
aabbe11e64 Improve function arguments parsing and checking 
* always use "argN" names for unnamed arguments
* honor space symbol between typename and "*", "&" symbols
* fix indent errors
 2012-12-26 17:55:03 +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
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
marina.kolpakova
285d6320be add #/usr/bin/env python to all python files 2012-11-23 22:57:22 +04: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
Andrey Kamaev
d0ec65e80c Fix linux build warning 2012-10-22 18:38:22 +04:00
Vadim Pisarevsky
40a30b6f30 fixed type "compatible -> incompatible" in the error message 2012-10-19 20:47:58 +04:00
Vadim Pisarevsky
d652cc72f2 fixed bugs #2100 (kind of) and #1393 
[edit: cleaned whitespace]
 2012-10-19 20:47:57 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
0e9405e591 Honor resently added functionality in hdr_parser and rst_parser; minor fixes in documentation 2012-09-14 22:26:32 +04:00
Vadim Pisarevsky
52ede9c84d fixed just introduced bug in Python wrapper generator 2012-09-11 20:04:18 +04:00
Vadim Pisarevsky
84087a8566 fixed crash in Python's SURF wrapper (bug #2325) 2012-09-11 16:47:25 +04:00
Andrey Kamaev
bcd0aefbca Fix gcc build errors and warnings 2012-09-05 15:51:51 +04:00
Vadim Pisarevsky
ff90c3eba6 possibly fixes #2242 and #2257 2012-08-13 21:22:06 +04:00
Alexander Mordvintesv
0adf68ae62 work on #2100: pyopencv_to functions now can receive argument information through ArgInfo structure. Non-contiguous input numpy arrays are copied. In case of non-contiguous output array the TypeError is thrown. 2012-08-07 21:03:17 +03:00
Andrey Kamaev
620d122fc2 Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings 2012-07-05 07:58:40 +00:00
Vadim Pisarevsky
acf356b080 added contrib module support in Python wrappers (thanks to Eric Christiansen) 2012-07-04 17:59:14 +00:00
Andrey Kamaev
d9c74f63e1 All tests writing temporary files are updated to use cv::tempfile() function 2012-06-25 11:24:06 +00:00
Andrey Kamaev
e94e5866a1 Fixed mingw build warnings 2012-06-20 17:57:26 +00:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Andrey Kamaev
dde8455db2 removed debug print 2012-05-31 11:06:06 +00:00
Andrey Kamaev
0809ae562e Fixed regression in python wrappers generator 2012-05-31 11:04:11 +00:00
Andrey Kamaev
cf25f572a6 Documentation: improved correctness checking for superclasses 2012-05-29 14:51:59 +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
18a8721f49 Small fixes for documentation checking script 2012-05-28 15:29:21 +00:00
Andrey Kamaev
78329b0dfe New bunch of documentation fixes 2012-05-28 14:36:15 +00:00
Andrey Kamaev
71625ad458 Fixed more documentation & source discrepancies 2012-05-28 11:22:43 +00:00
Andrey Kamaev
eb2f1f81ed Fixed hundreds of documentation problems 2012-05-28 07:36:14 +00:00
Andrey Kamaev
7e698726e4 Added new script for checking correctness of documentation 2012-05-28 07:34:49 +00:00
Alexander Mordvintsev
61fd5ed0e1 fixed #1969 2012-05-22 11:21:25 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Andrey Kamaev
72f2523d0f Fixed ~20 potential errors identified by the MS complier. 2012-03-31 11:09:16 +00:00
Alexander Mordvintsev
6848c6d69a reverted revision 7676 (#1725) 2012-03-28 09:44:54 +00:00
Alexander Mordvintsev
13045dec1d working on python wrappers for stitching 2012-03-28 05:00:41 +00:00
Vadim Pisarevsky
846e37ded5 fixed many warnings from GCC 4.6.1 2012-03-17 09:22:31 +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
Ilya Lysenkov
df6a95ed87 Wraped SimpleBlobDetector for Python 2012-03-12 11:39:48 +00:00
Alexander Mordvintsev
f6fec7ad2f fixed python GIL reacquire in case of exception 2012-03-10 05:56:40 +00:00
Alexander Mordvintsev
0e27c772aa using RAII to manage GIL -- still fails to handle exceptions correctly 2012-03-07 12:46:21 +00:00
Alexander Mordvintsev
58174f6ada Added GIL-release code into python wrappers 
Added gabor_threads.py sample
 2012-03-07 11:09:27 +00:00
Vadim Pisarevsky
d1b5f43700 adjust the header parser to support "public virtual" construction and make a tweak for multiple inheritance, fix potential memory problem with Python's IplImage.tostring() method (ticket #1486) 2012-01-25 13:25:35 +00:00
Alexander Mordvintsev
028c44531f wrapped FlannBasedMatcher (and extended DescriptorMatcher wrapper) 
updated feature_homography.py sample to use new features
 2011-09-15 11:10:06 +00:00
Alexander Mordvintsev
d50cc51070 handling Ptr<> arguments and return values in Python wrappers 
partially wrapped features2d framework
added feature_homography.py sample
 2011-09-07 09:38:22 +00:00
Vadim Pisarevsky
a5df21bf24 removed problem with duplicated CV_OUT InputOutputArray parameters (ticket #1348) 2011-08-31 12:36:19 +00:00
Vadim Pisarevsky
a51a8ad577 fixed tickets #1301, #1303, #1305 2011-08-14 19:46:39 +00:00
Vadim Pisarevsky
cff30dd2bb added cv.py micro-module for backward compatibility with existing Python scripts using prev-gen Python API. 2011-08-12 18:03:01 +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
e2e4ee2f53 disable implicit numpy array use in old-style Python bindings because of hard-to-fix memory leaks (ticket #1177) 2011-08-06 20:15:29 +00:00
Vadim Pisarevsky
d8417af086 fixed and improving formatting in opencv2refman.pdf. added support for n-channel mask in Mat::copyTo() and n-channel images in cv::compare(). fixed 2 compile warnings in opencv_python. 2011-07-24 10:34:14 +00:00
Vadim Pisarevsky
f4f2340039 fixed just introduced compile errors on Mac 2011-07-19 13:07:51 +00:00
Vadim Pisarevsky
ff5e97c8e4 added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings 2011-07-19 12:27:07 +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
Alexander Mordvintsev
bcac8769b5 fixed broken python cv2.cpp build after rev.6089 2011-07-18 06:48:55 +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
562914e33b upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN. 2011-07-13 23:04:39 +00:00
Vadim Pisarevsky
5352684647 fixed memleak in Python bindings (ticket #1219) 2011-07-13 08:55:06 +00:00
Andrey Pavlenko
fbfddbd3ea - 'c_string' support added to Java API 
- improved CV_IN_OUT/CV_OUT handling for generated Python/Java wrappers
 2011-07-12 21:13:56 +00:00
Vadim Pisarevsky
569b1ad582 embeded cv Python module into cv2. 2011-07-12 12:56:03 +00:00
Andrey Kamaev
ed8a2af9b6 Improved rst parser; fixed bug in hdr_parser; some small fixes in documentation 2011-07-07 14:49:24 +00:00
Vadim Pisarevsky
5649f35757 some more bugfixed in 2.3 propagated to trunk 2011-07-07 11:43:21 +00:00
Vadim Pisarevsky
b204e73d9a propagated some more fixes from 2.3 branch to the trunk 2011-06-29 22:06:42 +00:00
Vadim Pisarevsky
22970b8270 fixed multiple GCC warnings on Ubuntu 11.04 2011-06-14 12:03:34 +00:00
Vadim Pisarevsky
127c2bf93e added missing highgui wrappers (ticket #1040) 2011-06-13 22:25:21 +00:00
Vadim Pisarevsky
23d211bfed applied patches from #1005 2011-06-13 22:04:28 +00:00
Vadim Pisarevsky
3b97f5d5e9 return Py_None for an empty mat (should fix #1120) 2011-06-13 21:47:35 +00:00
Vadim Pisarevsky
f9fc180e1a fixed tickets #1117 and #954 2011-06-10 17:22:33 +00:00
Vadim Pisarevsky
2741dd0ea6 make type registration ordering in cv2.so consistent with the declaration order (fixes the class hierarchy; see ticket #1113) 2011-06-10 13:22:40 +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
c7a42e9682 started work on API & doc synchronization (in particular, Mat& => Input/OutputArray in the descriptions) 2011-06-07 22:51:31 +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
Alexander Mordvintsev
6dc7ae0ff6 added some constants to python cv2 api 2011-06-06 14:18:25 +00:00
Vadim Pisarevsky
124967eefb very first version of the documentation checking script 2011-06-01 21:15:36 +00:00
Vadim Pisarevsky
3a4e06e289 resolved ticket #1104 (processing of transposed numpy arrays) 2011-05-31 15:43:11 +00:00
Vadim Pisarevsky
facbdc92cb fixed multi-channel 1x1 array construction (ticket #1103) 2011-05-31 15:27:31 +00:00
Andrey Pavlenko
0f5f60f7f5 - extra spaces are removed 
- static class member modifier processing is fixed (moved from 'rettype' to 'func_modlist')
 2011-05-17 12:52:07 +00:00
Alexander Mordvintsev
30f9710d55 fixed #808 and #848 2011-05-16 10:52:20 +00:00
Ilya Lysenkov
a685be3ea9 Added extra argument for BlobDetector in findCirclesGrid 2011-05-06 14:02:07 +00:00
Vadim Pisarevsky
7f7965bc93 separated opencv 1.x and opencv 2.x wrappers. moved tests/python/* to modules/python/test 2011-05-03 16:00:31 +00:00