mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-27 03:14:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,967 Commits 6 Branches 127 Tags 3 GiB
2e33844f0d
Commit Graph

245 Commits

Author SHA1 Message Date
Maksim Shabunin
78ddc567f9 Python generator: moved base class handling to the generate step 2015-06-05 12:41:23 +03:00
Maksim Shabunin
c137ba53a0 Wrap ANN_MLP class into Python 2015-05-06 15:21:23 +03:00
Mansour Moufid
b99f7a29df Cast some image coordinates and sizes to double. 
Conflicts:
	modules/gpu/perf/perf_imgproc.cpp

Cast a long integer to double explicitly.

Conflicts:
	modules/python/src2/cv2.cpp

Cast some matrix sizes to type int.

Change some vector mask types to unsigned.

Conflicts:
	modules/core/src/arithm.cpp
 2015-04-25 18:54:53 +02:00
Ying Xiong
2d8b4fea9f Add #ifdef's such that python wrapper builds independent of other components 2015-04-06 19:57:10 -04:00
Maksim Shabunin
82adf7955f Fix python submodules inheritance detection 2015-03-26 11:22:56 +03:00
Adam Greig
211a131351 Fix Python3 binding's submodules 
Previously the Python3 cv2 package ends up with no submodules (bgsegm, face,
etc) in it, which makes a lot of functionality unusable. By not writing over
our root reference we ensure the new submodules are added to the correct cv2
module.
 2015-03-10 22:07:53 +00:00
Mike Izbicki
ac47c0c624 fix to work with python 2.6 
I had to make this modification locally to get opencv to build with python 2.6.  Python 2.6 requires indices in the format string (the `0` I added).  This requirement was relaxed in 2.7, so what used to be there would be working for people who could upgrade. I don't think the change has any negative consequences for future python versions, but I'm no expert.
 2015-01-02 14:41:44 -08:00
Shiquan Wang
7127634aa0 Mod: Open header files with io.open for Python 2/3 compatibility. 2014-11-10 21:09:43 +08:00
abidrahmank
797143d515 extending stitching module for Java and Python bindings 2014-09-27 19:35:49 +04:00
Huu Nguyen
81b9be1623 Fix implicit narrowing error in initializer list 
The implicit narrowing in the initializer list throws a compiler error for some compilers with C++11 support turned on. The specific error message is: "error: narrowing conversion of 'PyInt_AsLong(((PyObject*)o))' from 'long int' to 'double' inside { }".

Tested on Clang 5.1.0 and Mac OS X 10.9.4.
 2014-09-16 15:30:10 -07:00
Alexander Mordvintsev
c1032b6232 remove structured_edge_detection.hpp from blacklist 
don't discard pure virtual methods in hdr_parser.py (was broken anyway)
 2014-09-01 13:55:41 +04:00
Alexander Mordvintsev
2a9e252f77 fix namespace conflicts (like cv::inpaint and cv::xphoto::inpaint) 
whitespace fix
 2014-08-21 17:33:21 +04:00
Alexander Mordvintsev
74c77d826f base class name resolution 
fixed find_obj.py
 2014-08-21 14:51:03 +04:00
Alexander Mordvintsev
c4c731c0aa fixing warnings 
keep old const names for compatibility
 2014-08-19 16:57:37 +04:00
Alexander Mordvintsev
c22dcb04af fixing warnings 2014-08-19 16:40:09 +04:00
Alexander Mordvintsev
e74cddfbd1 put consts into python submodules 
maintain set of visited namespaces in CppHeaderParser
WARNING: REMOVED const name conversion (SomeConstName -> SOME_CONST_NAME), discussion needed
 2014-08-19 16:40:09 +04:00
Alexander Mordvintsev
6d1c02ffed unified namespace population with 'init_submodule' 2014-08-19 16:40:08 +04:00
Alexander Mordvintsev
4a519a25f3 nested classes support 2014-08-19 16:40:08 +04:00
Alexander Mordvintsev
5ad7f9910f function namespaces partially work 2014-08-19 16:40:07 +04:00
Alexander Mordvintsev
e85e83f491 handling namespaces on parsing functions 
submodule method tables generation
 2014-08-19 16:40:06 +04:00
Vadim Pisarevsky
8e9d1d9fe6 temporarily disabled java bindings for ml; hopefully fixed warnings etc. 2014-08-03 04:28:20 +04:00
Vadim Pisarevsky
e368f17caf fixed python bindings generation 2014-07-30 16:11:08 +04:00
Alexander Mordvintsev
9ab3b89c53 pass header list to gen2.py by a text file (avoid command line length limit on windows) 2014-07-27 17:17:36 +04:00
Alexander Mordvintsev
42ecfc5538 fixed parsing enums with tailing comma 
gen2.py reports headers it processes
cmake file restructured
 2014-07-27 17:17:35 +04:00
Alexander Mordvintsev
1d1bfd3d7d automatic search for headers for python wrapper generation 2014-07-27 17:17:35 +04:00
vbystricky
d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
vbystricky
4286f60387 Extract imgcodecs module from highgui 2014-07-07 16:28:08 +04:00
Vadim Pisarevsky
3858f2291d removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps. 
some of the stuff will be moved to opencv_contrib module.
in order to make this PR pass buildbot, please, comment off opencv_legacy, opencv_contrib and opencv_softcascade test runs.
 2014-06-24 19:18:51 +04:00
Gabe Schwartz
c19b6ed20e Fixed pyopencv_to w/FLANN IndexParams in python3. 
The keys() and values() functions on dictionaries in Python 3 no longer
return lists.  pyopencv_to() for flann::IndexParams now iterates over
the dictionary in a way that is version-agnostic.
 2014-05-21 15:21:41 -04:00
Alexander Mordvintsev
2756ae2051 exposed OpenCL-control functions to python 2014-05-14 17:42:21 +04:00
Alexander Mordvintsev
dd67ea0210 find -> rindex 2014-05-13 17:55:57 +04:00
Alexander Mordvintsev
120b3a1e77 Work on python wrapped generation automation: 
- all parsed headers are included into "cv2.cpp" with "pyopencv_generated_include.h"
 - types starting with "Ptr_" converted to "Ptr<...>" form (avoids many typedefs in "cv2.cpp")
 2014-05-12 15:49:54 +04:00
Vadim Pisarevsky
7942494fb6 Merge pull request #2233 from palindromoroz:BGSubtract_KNN_new_code 2014-04-15 13:22:43 +04:00
unknown
75534a4828 Python typdef fixed. Reverted the example to MOG2. Not time to make the command line switch for now. 2014-03-28 14:23:10 +01:00
Alexander Alekhin
95e38e457f core/umat: usage flags (with proposals from PR #2195) 2014-02-14 15:40:16 +04:00
Alexander Alekhin
91ca834be9 bug fix for issue 3470 2014-02-03 14:46:22 +04:00
Roman Donchenko
9dfb96389c Merge commit '4b885e206' into merge-2.4 2013-12-30 16:48:45 +04:00
Andrey Pavlenko
f9aa148ba9 eliminating VS2013 build warnings 2013-12-26 13:35:59 +04:00
Vadim Pisarevsky
6da5d21331 fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance 2013-12-01 03:12:19 +04:00
Michael Pratt
8aafd569c8 Support PyString_AsString() in Python 3 < 3.3 
In Python 3, version 3.3+, PyUnicode_AsUTF8() provides similar
functionality to Python 2's PyString_AsString().

In older versions of Python 3, there is no public function to provide
the same functionality.  However, the "internal" _PyUnicode_AsString()
does provide that functionality, so use it to replace
PyString_AsString().

With this patch, cv2 should compile for Python 3.[0-2].
 2013-11-07 23:47:33 -05:00
Vadim Pisarevsky
e14171fd33 fixed crash in Python bindings 2013-10-24 17:37:33 +04:00
Vadim Pisarevsky
303df78cca removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now 2013-10-24 16:08:15 +04:00
Vadim Pisarevsky
de521fc9fa fixed some more compile bugs (including Python bindings) 2013-10-22 23:34:16 +04:00
Roman Donchenko
1ac1b9ae35 Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
Vadim Pisarevsky
851a8a1cd0 fixed whitespace error 2013-09-30 14:31:39 +04:00
Alexander Mordvintsev
f0b050fa88 exposed LineSegemntDetector to python 2013-09-30 14:30:00 +04:00
Fedor Morozov
c9ace38897 Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
Fedor Morozov
f99be6bda6 Mergin itseez 2013-09-18 18:55:12 +04:00
Alexander Mordvintsev
79d51c3398 expose findEssentialMat, decomposeEssentialMat and recoverPose to Python 2013-09-09 14:02:05 +04:00
Roman Donchenko
dadee3752c Adapt Python bindings to the new Ptr. 2013-09-05 19:03:00 +04:00
Alexander Shishkov
924f7ce373 small changes for compilation 2013-09-03 14:05:14 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04: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
Roman Donchenko
bcba3fc6b8 Merge pull request #1263 from abidrahmank:pyCLAHE_24 2013-08-14 12:10:22 +04:00
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