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
