Vadim Pisarevsky
6f86c9f118
another mac-related fix, let's squeeze it in this PR too
10 years ago
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
10 years ago
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
10 years ago
Vadim Pisarevsky
e2f24f43c9
added some basic functionality needed by the new face module (moved from the old "contrib")
10 years ago
Michael Pratt
7d41ce23a7
Build Python 3 bindings in subdirectory
...
Build the Python 3 cv2 module in lib/python3/, to avoid potential naming
conflicts with the Python 2 bindings.
The Python 2 bindings are placed directly in lib/, where they are
required for the Buildbot to successfully execute the Python tests.
10 years ago
Michael Pratt
d921cde4d2
Add opencv_matlab to Python ignored modules
...
Requested by @vpisarev in #3047 .
10 years ago
Michael Pratt
9d9411555f
Place Python library out in dedicated folder
...
Place the built Python module library in a dedicated folder inside of
lib/. This ensures that even if the Python 2 and Python 3 module names
conflict, they will not overwrite one another.
10 years ago
Michael Pratt
cac1218eef
Build both Python 2 and Python 3 bindings
...
If both Python 2 and Python 3 are found, then build bindings for both of
them during the build process. Currently, one version of Python is
detected automatically, and building for the other requires changes the
CMake config.
The largest chunk of this change generalizes OpenCVDetectPython.cmake to
find both a Python 2 and Python 3 version of Python. Secondly, the
opencv_python module is split into two modules, opencv_python2 and
opencv_python3. Both are built from the same source. but for different
versions of Python.
11 years ago
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.
11 years ago
Alexander Mordvintsev
2756ae2051
exposed OpenCL-control functions to python
11 years ago
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")
11 years ago
Alexander Smorkalov
3ebdcafdd3
All installed files marked with component names for install customization.
...
(cherry picked from commit b75cbfde45
)
Conflicts:
cmake/OpenCVModule.cmake
11 years ago
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
11 years ago
Alexander Alekhin
4adede4246
cmake: python module updates
11 years ago
Roman Donchenko
67ae438dae
Refactored NumPy detection.
...
Most importantly, added support for multiple include directores,
but also did some general cleanup.
11 years ago
berak
1b10860f36
added add_definitions(-DCVAPI_EXPORTS) to cmakelists.txt
12 years ago
Gabe Schwartz
bce1b352e7
Updated cmake files to use print().
...
In these cases, just using print() is enough to ensure py2/3
compatibility.
12 years ago
Pablo Speciale
caf449a991
The deletion of "cv.py" file (Commit b2ba8b9
) breaks "make install"
12 years ago
Andrey Kamaev
b2ba8b9969
Drop old python interface
12 years ago
Andrey Kamaev
7193a73ca0
Move FileStorage to separate header
12 years ago
Andrey Kamaev
2249f19120
Move cv::Range, cv::KeyPoint and cv::DMatch
12 years ago
Andrey Kamaev
707d3e0a62
Python wrapper is adapted for cv::String
12 years ago
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
12 years ago
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>
12 years ago
marina.kolpakova
1613aa45bc
fix python bindings
12 years ago
marina.kolpakova
f3227c3f1a
merged ICFPreprocessor and Channels -> ChannelFeatureBuilder
12 years ago
Andrey Kamaev
46c4390a2e
Hardly refactored CMake script for Java wrappers
12 years ago
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
12 years ago
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
12 years ago
Vadim Pisarevsky
acf356b080
added contrib module support in Python wrappers (thanks to Eric Christiansen)
13 years ago
Andrey Kamaev
f666bd221f
Merged the trunk r8595:8668 (except iOS and new gpu functionality)
13 years ago
Andrey Kamaev
5349fa0302
Fixed target_link_libraries for python bindings
13 years ago
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
13 years ago
Andrey Kamaev
247e2d085f
Updated for cmake 2.8.8
13 years ago
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
13 years ago
Andrey Kamaev
a13f03f61e
Fixed/suppressed remaining warnings from the python bindings
13 years ago
Alexander Shishkov
bc803ec93e
nonfree is optional for Python module now
13 years ago
Alexander Shishkov
b79dfaf078
fixed problem with SURF loading in Python tests
13 years ago
Andrey Kamaev
7cc7a3f37d
Suppressed hundreds of useless MSVC warnings (can be reenabled setting cmake variable ENABLE_NOISY_WARNINGS to ON). Fixed some of remaining warnings.
13 years ago
Andrey Kamaev
c16a1d86cc
Fixed python detection on Windows with both 32bit and 64bit pythons installed.
13 years ago
Andrey Kamaev
77425edd11
#1532 Debug version of python bindings is excluded from install
13 years ago
Alexander Mordvintsev
6848c6d69a
reverted revision 7676 ( #1725 )
13 years ago
Alexander Mordvintsev
13045dec1d
working on python wrappers for stitching
13 years ago
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.
13 years ago
Andrey Kamaev
18dbe6b3e5
cmake scripts are updated to prefer includes from the OpenCV source tree
13 years ago
Andrey Kamaev
23af203e00
Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts
13 years ago
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
13 years ago
Andrey Kamaev
9d5c24cdc8
Updating opencv module definition in cmake (continued)
13 years ago
Andrey Kamaev
8cab65c173
Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.
13 years ago
Vadim Pisarevsky
cff30dd2bb
added cv.py micro-module for backward compatibility with existing Python scripts using prev-gen Python API.
14 years ago