Vadim Pisarevsky
d30729a816
Merge pull request #3047 from prattmic:python2and3
10 years ago
Vadim Pisarevsky
44f24efad4
Merge pull request #3054 from zillatrooper:master
10 years ago
arc
3d0a270a66
Merge branch 'master' into python2and3
10 years ago
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.
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
Vadim Pisarevsky
0428ce4703
Merge pull request #3037 from PhilLab:pnpPatch
10 years ago
Björn Wöldecke
f3aa4bdf59
fix misinterpretation of empty window name
...
The documentation states, that a NULL or an empty window name can be used
to refer to the control panel. But the string parameters of the C++ frontend
methods cannot be NULL and converting an empty string to a const char* by
c_str() doesn't produce a NULL pointer, but an empty string. Unfortunately,
the const char* pointer is just passed on to the standard C functions in
the QT backend, which doesn't check for the empty string case.
There are two places where the empty string check could have been introduced:
inside the frontend or inside the backend. As long as the documentation only
mentions this as a special case for the QT backend, the best place seems to
be there.
10 years ago
Vadim Pisarevsky
ca183707f2
Merge pull request #3039 from alalek:ocv_world
10 years ago
Vadim Pisarevsky
bab5700a09
Merge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate
10 years ago
Vadim Pisarevsky
d611684d9e
Merge pull request #3041 from adrians:optimize_split
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
976c727eec
Fix a few more PYTHON_NUMPY_INCLUDE_PATH
...
The previous commit fixing references to PYTHON_NUMPY_INCLUDE_PATH
missed a few unset()s.
10 years ago
Michael Pratt
218b12c557
Merge branch 'master' into python2and3
10 years ago
Alexander Alekhin
fc0f254f00
make distrib with world (shared libs)
10 years ago
Alexander Alekhin
55188fe991
world fix
10 years ago
Alexander Alekhin
d2f1c00719
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix
10 years ago
Alexander Alekhin
06547120aa
Merge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix
10 years ago
Alexander Alekhin
74d2a6eed1
Merge pull request #3035 from ElenaGvozdeva:ocl_test_fix
10 years ago
vbystricky
774d277c1f
Fix error in OpenCl version of meanstddev for continues src and not continues mask
10 years ago
vbystricky
2637b18b67
Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types
10 years ago
Elena Gvozdeva
7999fbf765
fixed ocl_integral
10 years ago
Elena Gvozdeva
f32b52ea8d
fixed test for CvtColor RGB -> Luv
10 years ago
Elena Gvozdeva
8c2c3b54d9
fixed ocl tests for BlendLinear, BoxFilter, Integral
10 years ago
Adrian Stratulat
b2acd1f75a
Vectorize split & merge for NEON
10 years ago
Vadim Pisarevsky
a05ce00a65
Merge pull request #2879 from alalek:ocl_runtime_flags
10 years ago
Vadim Pisarevsky
a58767eff8
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix
10 years ago
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
10 years ago
unknown
3fe4980ce1
Double precision for solvePnPRansac()
10 years ago
vbystricky
2d587ad691
Prevent generating test case with mask filled 0 only
10 years ago
Vadim Pisarevsky
cb9b88e65b
fixed more compile warnings on Windows
10 years ago
Vadim Pisarevsky
dbedc63c55
Merge pull request #3034 from jet47:fix-compilation
10 years ago
Vladislav Vinogradov
a3da3a01e1
fix test_opencv_imgproc compilation
10 years ago
Vladislav Vinogradov
cdb7b83741
fix python module compilation with enabled CUDA support:
...
filterout all CUDA related headers from python module include headers
10 years ago
Alexander Alekhin
add9ce46c3
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
10 years ago
Vadim Pisarevsky
222f8a3d5e
hopefully fixed test failure on Linux
10 years ago
Vadim Pisarevsky
24b01a8e4f
continuing to debug boost and fix MSVC compile errors
10 years ago
Vadim Pisarevsky
98a1181240
fixed the condition
10 years ago
Vadim Pisarevsky
79b593d8d8
more fixes and more debugging code
10 years ago
Vadim Pisarevsky
eeb786fcfd
fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code
10 years ago
Vadim Pisarevsky
9cb79b9abb
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
10 years ago
Vadim Pisarevsky
8e9d1d9fe6
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
10 years ago
Vadim Pisarevsky
2520e335d1
removed many extra whitespaces; fixed 1 warning
10 years ago
Vadim Pisarevsky
28ca6ac05e
fixed building html docs
10 years ago
Vadim Pisarevsky
d3cdfefa03
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB
10 years ago
Vadim Pisarevsky
c6593d02a6
updated docs
10 years ago
Vadim Pisarevsky
c20ff6ce19
made everything compile and even run somehow
10 years ago
VBystricky
2026094691
Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests
10 years ago
Alexander Alekhin
c595457ea0
Merge pull request #3011 from vbystricky:oclopt_morthosmall
10 years ago
Alexander Alekhin
11dd36f3aa
Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix
10 years ago