8c08258cf2
moved headers
11 years ago
3a2cf37115
fixed conflicts
11 years ago
837f001789
update cmake
11 years ago
381574bdb7
Modified cmake
11 years ago
d30729a816
Merge pull request #3047 from prattmic:python2and3
11 years ago
44f24efad4
Merge pull request #3054 from zillatrooper:master
11 years ago
3d0a270a66
Merge branch 'master' into python2and3
11 years ago
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.
11 years ago
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.
11 years ago
d921cde4d2
Add opencv_matlab to Python ignored modules
...
Requested by @vpisarev in #3047 .
11 years ago
0428ce4703
Merge pull request #3037 from PhilLab:pnpPatch
11 years ago
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.
11 years ago
ca183707f2
Merge pull request #3039 from alalek:ocv_world
11 years ago
bab5700a09
Merge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate
11 years ago
d611684d9e
Merge pull request #3041 from adrians:optimize_split
11 years ago
f1b6809eee
Updated Utils functions
11 years ago
2881f2a096
Fixed warnings
11 years ago
d2665b655e
Fixed warnings
11 years ago
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.
11 years ago
976c727eec
Fix a few more PYTHON_NUMPY_INCLUDE_PATH
...
The previous commit fixing references to PYTHON_NUMPY_INCLUDE_PATH
missed a few unset()s.
11 years ago
e14f91dd37
Update headers
11 years ago
ddf5c86f3a
Added code
11 years ago
57d2cb8962
deleted: src/CsvReader.cpp
...
deleted: src/CsvReader.h
deleted: src/CsvWriter.cpp
deleted: src/CsvWriter.h
deleted: src/Mesh.cpp
deleted: src/Mesh.h
deleted: src/Model.cpp
deleted: src/Model.h
deleted: src/ModelRegistration.cpp
deleted: src/ModelRegistration.h
deleted: src/PnPProblem.cpp
deleted: src/PnPProblem.h
deleted: src/RobustMatcher.cpp
deleted: src/RobustMatcher.h
deleted: src/Utils.cpp
deleted: src/Utils.h
deleted: src/main_detection.cpp
deleted: src/main_registration.cpp
deleted: src/main_verification.cpp
deleted: src/test_pnp.cpp
11 years ago
218b12c557
Merge branch 'master' into python2and3
11 years ago
43301096d3
Update tutorial
11 years ago
fc0f254f00
make distrib with world (shared libs)
11 years ago
55188fe991
world fix
11 years ago
7b0be9cf8f
Update code
11 years ago
0d2bc9b0a1
Removed whitespaces
11 years ago
2353436cb5
Removed whitespace
11 years ago
d2f1c00719
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix
11 years ago
4447dbe265
Removed whitespace
11 years ago
06547120aa
Merge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix
11 years ago
74d2a6eed1
Merge pull request #3035 from ElenaGvozdeva:ocl_test_fix
11 years ago
e3afc32693
Removed whitespace
11 years ago
55819ae464
Tutorial code restructure
11 years ago
774d277c1f
Fix error in OpenCl version of meanstddev for continues src and not continues mask
11 years ago
23785faf02
Update for NON BOOST libraries
11 years ago
2637b18b67
Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types
11 years ago
16e750dd37
Update for Boost libraries
11 years ago
1727e0acf6
Update for Boost libraries
11 years ago
dfa3ccdea9
Update for Boost libraries
11 years ago
a3e74ec521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
11 years ago
7999fbf765
fixed ocl_integral
11 years ago
f32b52ea8d
fixed test for CvtColor RGB -> Luv
11 years ago
8c2c3b54d9
fixed ocl tests for BlendLinear, BoxFilter, Integral
11 years ago
b2acd1f75a
Vectorize split & merge for NEON
11 years ago
a05ce00a65
Merge pull request #2879 from alalek:ocl_runtime_flags
11 years ago
a58767eff8
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix
11 years ago
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
11 years ago
edgarriba
Vadim Pisarevsky
arc
Michael Pratt
Björn Wöldecke
Alexander Alekhin
vbystricky
Elena Gvozdeva
Adrian Stratulat