Commit Graph

229 Commits

Author SHA1 Message Date
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
Andrey Kamaev
77425edd11 #1532 Debug version of python bindings is excluded from install 2012-03-29 23:10:21 +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
Ilya Lysenkov
4a7efa548f Added points comparison in test_remap 2012-03-26 11:07:27 +00:00
Ilya Lysenkov
159022844e Restored and improved the test_remap Python test 2012-03-26 10:25:24 +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 Shishkov
d95127c279 #1672
updated some more links
2012-03-11 16:01:20 +00:00
Alexander Shishkov
be63ce723f #1672
updated links in cheatsheet
renamed directory for Mat tutorial 
changed links from willow docs to opencv.itseez.com, from Trac to current Redmine
2012-03-11 14:35:46 +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
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Andrey Kamaev
23af203e00 Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts 2012-02-06 11:30:59 +00:00
Andrey Kamaev
984eb99428 Global CMake reorganization:
[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Vadim Pisarevsky
9469f65094 added tests on cv.CreateImage() (thanks to mythsmith). 2012-01-25 13:32:48 +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
Andrey Kamaev
9d5c24cdc8 Updating opencv module definition in cmake (continued) 2012-01-25 09:04:49 +00:00
Andrey Kamaev
8cab65c173 Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options. 2012-01-03 13:48:12 +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
Vadim Pisarevsky
5bb8076d7d added centerPrincipalPoint=false to getOptimalNewCameraMatrix (ticket #1199) 2011-07-07 21:38:21 +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
cc9a1bb62f propagated some more fixes from 2.3 branch to the trunk 2011-06-30 12:06:26 +00:00
Vadim Pisarevsky
b204e73d9a propagated some more fixes from 2.3 branch to the trunk 2011-06-29 22:06:42 +00:00
Andrey Kamaev
b43ae03328 * Install path share/opencv is renamed to share/OpenCV.
* Fixed zlib search.
* Fixed compiler/linker flags caching bug.
* Fixed OpenCVConfig.cmake generation (currently tested only on Unix).
2011-06-27 13:59:03 +00:00
Andrey Kamaev
f0227edd2c Minor python search improvements 2011-06-27 08:24:10 +00:00
Vadim Pisarevsky
49467947ac propagated some fixes from 2.3 to trunk 2011-06-23 12:00:09 +00:00
Vadim Pisarevsky
babec51880 fixed memory leaks in fromarray (thanks to Matthew Baker for the patch!) 2011-06-19 20:14:42 +00:00
Vadim Pisarevsky
22970b8270 fixed multiple GCC warnings on Ubuntu 11.04 2011-06-14 12:03:34 +00:00
Alexander Shishkov
6ecebb7f66 fixed #768 ticket
renamed OPENCV_SOURCE_DIR to OpenCV_SOURCE_DIR
2011-06-14 10:19:56 +00:00
Alexander Shishkov
ca758a9dac fixed #768 ticket 2011-06-14 10:11:16 +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
22927ff121 fixed ticket #983 2011-06-13 21:20:38 +00:00
Vadim Pisarevsky
9df999154c fixed a few warnings and bugs, including ticket #1079 2011-06-12 20:29:50 +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
e46d98a162 excluded "-B" flag for better compatibility with old Python. 2011-06-07 10:22:32 +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
2c1e913b2d added 16-bit support to Bayer2RGB & Bayer2Gray (ticket #686); fixed bug in cv.CreateHist() when no ranges are passed (ticket #990) 2011-06-03 15:45:50 +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
Alexander Shishkov
128d030533 fixed problem with VideoInput on Windows when OpenCV compiled statically (ticket #573)
added ignore linker flags for opencv2_python
2011-05-30 14:08:43 +00:00
Alexander Shishkov
33e71127f7 fixed problem with VideoInput on Windows when OpenCV compiled statically (ticket #573) 2011-05-30 13:32:57 +00:00
Vadim Pisarevsky
cfedf0c5d5 compile cv2.so also as a shared library 2011-05-27 19:59:48 +00:00
Alexander Shishkov
0eb1bb3673 cv.so library always compiled as shared library 2011-05-27 15:18:49 +00:00
Ethan Rublee
355ad2993a adding c++ interface to the datamtrix codes of j. 2011-05-25 00:23:50 +00:00
Ethan Rublee
89b5f40ce3 Reverting the boost::python bindings, moving dev to out of trunk. 2011-05-24 22:01:41 +00:00
Ethan Rublee
44e9fdaa2d Initial pass at some boost python bindings. 2011-05-23 17:26:58 +00:00
Vadim Pisarevsky
23768b1826 replaced #include <some_opencv_hdr> with #include "some_opencv_hdr" (ticket #719) 2011-05-21 18:32:34 +00:00
Vadim Pisarevsky
0c504b42a0 copied helper modules from doc to modules/python/test 2011-05-17 15:52:23 +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
Vadim Pisarevsky
0243fe6b07 disabled creation of hdr_parser.pyc 2011-05-13 13:26:14 +00:00
Andrey Pavlenko
ad4969d81a Removing auto-generated file 2011-05-11 18:34:06 +00:00
Ilya Lysenkov
a685be3ea9 Added extra argument for BlobDetector in findCirclesGrid 2011-05-06 14:02:07 +00:00
Vadim Pisarevsky
71d14386e4 fixed generation of Python wrapper cv2. 2011-05-04 19:45:21 +00:00
Vadim Pisarevsky
d3a159d3cc added missing Python wrappers for OpenCV 1.x 2011-05-04 17:31:48 +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
Vadim Pisarevsky
23a9b7bb9c fixed several warnings from Xcode 4 LLVM compiler; fixed bug #920 2011-04-30 19:29:26 +00:00
James Bowman
181de06445 restore data matrix 2011-04-26 00:01:41 +00:00
Alexey Kazakov
e9aa6fa012 Added ROC-curve calculating to the cascade detection algorithm 2011-04-22 10:03:05 +00:00
Vadim Pisarevsky
64814321ee removed compiled hdr_parser.py 2011-04-21 12:05:56 +00:00
James Bowman
f385bb97eb datamatrix 2011-04-21 00:47:37 +00:00
James Bowman
324e89ab3a datamatrix 2011-04-21 00:21:42 +00:00
Vadim Pisarevsky
9a991a2e10 fixed build problems on Windows 2011-04-18 15:14:32 +00:00
Vadim Pisarevsky
335370a7c0 moved Python bindings source code into src subdirectory; preparing to add python/doc and python/test subdirectories 2011-04-17 13:09:04 +00:00
Vadim Pisarevsky
535425982f extended libdc1394 backend (the patch is by Michael Joachimiak) 2011-04-01 18:29:32 +00:00
Vadim Pisarevsky
30dcfe0c7a 2011-03-05 06:28:19 +00:00
Vadim Pisarevsky
371aa08006 OpenCV reference manual (C++ part only for now) is now produced directly from RST, not from TeX. 2011-02-22 20:43:26 +00:00
Vadim Pisarevsky
b38a11e837 .pyc files should not be in the repository 2011-02-09 22:52:59 +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
James Bowman
6b4047eb46 #586: exceptions on invalid element access 2011-01-25 01:33:48 +00:00
James Bowman
3a53d8667a #489, leaking cvarrmat test and fix 2011-01-25 01:05:12 +00:00
James Bowman
4c4ff882ad Fix for #791: MatchShapes 2011-01-21 21:55:52 +00:00
James Bowman
d3462dfcba #674, fix leaks in CreateHist 2011-01-19 20:47:10 +00:00
James Bowman
8503f75212 Fixed leak of dims in MatND creates 2011-01-19 01:43:45 +00:00
James Bowman
d2d52c7310 #818, Propset Rev 2011-01-19 00:22:02 +00:00
James Bowman
6004687563 #759. memtrack comments, sealed the numpy MatND leak 2011-01-19 00:05:30 +00:00
James Bowman
af86e87c70 Export CV_PI explcitly, #758. 2010-12-14 00:13:42 +00:00
Vadim Pisarevsky
8754cafffb extended cv.KMeans2 API in Python (ticket #414; thanks to hogelog). fixed failures in the opencv python tests. 2010-11-30 10:11:38 +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
de4f1aeb06 fixed some GCC 4.4 warnings 2010-11-20 12:05:28 +00:00
Vadim Pisarevsky
8a8ba57b20 fixed building Python wrappers when Numpy is not available 2010-11-03 17:57:51 +00:00
Vadim Pisarevsky
5b6a755719 almost finished Python wrappers 2010-11-02 17:58:22 +00:00
Vadim Pisarevsky
00ec555252 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:11:53 +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
Marius Muja
16b1f61c83 Updated FLANN to version 1.5 2010-10-12 19:47:50 +00:00
Vadim Pisarevsky
6b8e60d033 the header parser for the extended OpenCV Python bindings 2010-10-12 15:59:00 +00:00
Ethan Rublee
244a537d54 _S happens to be a bad variable name for android 2010-10-09 02:15:08 +00:00
James Bowman
5051c635b1 #593 add ConvertImage 2010-10-04 17:34:52 +00:00
James Bowman
5b7b6d9195 #509, patch for GetTrackbarPos 2010-08-01 16:18:59 +00:00
James Bowman
b4af9c620a cvarrseq args attempt array conversions first 2010-07-23 17:55:37 +00:00
James Bowman
d10b3c8665 #489, Forbid transposed matrices in fromarray() 2010-07-23 17:04:06 +00:00
James Bowman
389c002eea grabCut fist impl and test 2010-07-22 23:39:42 +00:00
Vadim Pisarevsky
550e635814 added numerical values to the new _VNG constants' definitions. 2010-07-21 08:55:50 +00:00
James Bowman
f6c55582d8 Added VNG Bayer enums 2010-07-20 18:31:10 +00:00
James Bowman
d6c6c3ecda #393, SnakeImage 2010-06-23 20:18:52 +00:00
James Bowman
6ebdcb879b #362, CvMoments fields now exposed, smoke tested by test_moments 2010-05-27 22:36:26 +00:00
James Bowman
8bcdb56ca9 #345, cvmat() now caught and exception raised 2010-05-13 00:39:13 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00