Maksim Shabunin
84379140ba
Python test: added options to provide local data path
2014-12-03 18:12:01 +03:00
Shiquan Wang
7127634aa0
Mod: Open header files with io.open
for Python 2/3 compatibility.
2014-11-10 21:09:43 +08:00
Vadim Pisarevsky
80a985c894
fixed path to the checkerboard image
2014-11-07 15:57:42 +03:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
abidrahmank
797143d515
extending stitching module for Java and Python bindings
2014-09-27 19:35:49 +04:00
Maksim Shabunin
6337fd0650
Support of bioinspired contrib module wrapping
...
- added java wrapper
- disabled python wrapper
2014-09-22 11:43:29 +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
c23d6b67ee
blacklisted 'tracking' due to some linking problem
2014-08-21 18:45:50 +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
40d0f853d6
removing modules from blacklist
2014-08-19 19:19:11 +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
740c5234b1
fix compile problems with contributed ximgproc/xphoto
2014-08-15 18:00:41 +04:00
Vadim Pisarevsky
6f86c9f118
another mac-related fix, let's squeeze it in this PR too
2014-08-14 10:45:47 +04:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
2014-08-10 23:24:16 +04:00
Vadim Pisarevsky
e2f24f43c9
added some basic functionality needed by the new face module (moved from the old "contrib")
2014-08-10 01:54:16 +04:00
arc
3d0a270a66
Merge branch 'master' into python2and3
2014-08-07 01:04:26 -04:00
Michael Pratt
e9ccadebed
Support Python 2 and 3 in test script
...
Add Python 3 support to the Python test.py script.
The print function is used in place of the print statement.
The urlopen function has been moved to urllib.request in Python 3, so
attempt to import it from either location.
TestCase.assert_() has been deprecated in place of
TestCase.assertTrue().
The tests all pass in both Python 2 and 3.
2014-08-07 00:51:48 -04:00
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.
2014-08-07 00:21:42 -04:00
Michael Pratt
d921cde4d2
Add opencv_matlab to Python ignored modules
...
Requested by @vpisarev in #3047 .
2014-08-07 00:16:49 -04:00
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.
2014-08-06 02:31:30 -04:00
Michael Pratt
976c727eec
Fix a few more PYTHON_NUMPY_INCLUDE_PATH
...
The previous commit fixing references to PYTHON_NUMPY_INCLUDE_PATH
missed a few unset()s.
2014-08-06 02:30:35 -04:00
Michael Pratt
218b12c557
Merge branch 'master' into python2and3
2014-08-06 01:45:07 -04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
Vladislav Vinogradov
cdb7b83741
fix python module compilation with enabled CUDA support:
...
filterout all CUDA related headers from python module include headers
2014-08-04 12:12:51 +04:00
Vadim Pisarevsky
8e9d1d9fe6
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
2014-08-03 04:28:20 +04:00
Michael Pratt
52df3b232d
Reference PYTHON_NUMPY_INCLUDE_DIRS not PYTHON_NUMPY_INCLUDE_PATH
...
PYTHON_NUMPY_INCLUDE_PATH was a typo, it should have been
PYTHON_NUMPY_INCLUDE_DIRS.
2014-07-31 03:27:06 -04:00
Michael Pratt
c9876c3cd8
Merge branch 'master' into python2and3
2014-07-31 01:13:16 -04:00
Vadim Pisarevsky
e368f17caf
fixed python bindings generation
2014-07-30 16:11:08 +04:00
Alexander Mordvintsev
5f47f70183
module blacklist
2014-07-27 18:03:27 +04:00
Alexander Mordvintsev
a2ae1db31c
'adas' extra module doesn't produce .lib on windows (causes link error)
2014-07-27 17:41:12 +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
964657a155
glob for python module dependences
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
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.
2014-06-29 20:08:13 -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