mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-01 23:30:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,088 Commits 6 Branches 126 Tags 3 GiB
d0f789dc90
Commit Graph

14088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Alekhin
d0f789dc90 Merge pull request #3044 from akarsakov:fix_ocl_tests 2014-08-07 20:14:17 +00:00
Alexander Karsakov
44fbfb2cf6 Fixed extrapolation in pyrDown 2014-08-07 10:39:25 +04:00
Alexander Karsakov
2a0b39d30a Fixed calculate_histogram kernel 2014-08-07 10:39:24 +04:00
Alexander Karsakov
eb9fdb0164 Fixed rounding in remap INTER_LINEAR mode 2014-08-07 10:39:24 +04:00
Alexander Karsakov
fec21239c8 Revert optimization for warpAffine INTER_NEAREST mode 2014-08-07 10:39:18 +04:00
Vadim Pisarevsky
d30729a816 Merge pull request #3047 from prattmic:python2and3 2014-08-07 06:38:37 +00:00
Vadim Pisarevsky
44f24efad4 Merge pull request #3054 from zillatrooper:master 2014-08-07 06:34:31 +00: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
Vadim Pisarevsky
0428ce4703 Merge pull request #3037 from PhilLab:pnpPatch 2014-08-06 20:21:05 +00:00
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.
 2014-08-06 19:02:48 +02:00
Vadim Pisarevsky
ca183707f2 Merge pull request #3039 from alalek:ocv_world 2014-08-06 14:52:52 +00:00
Vadim Pisarevsky
bab5700a09 Merge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate 2014-08-06 11:26:07 +00:00
Vadim Pisarevsky
d611684d9e Merge pull request #3041 from adrians:optimize_split 2014-08-06 09:22:38 +00: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
fc0f254f00 make distrib with world (shared libs) 2014-08-05 20:37:18 +04:00
Alexander Alekhin
55188fe991 world fix 2014-08-05 20:12:35 +04:00
Alexander Alekhin
d2f1c00719 Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix 2014-08-05 14:52:22 +00:00
Alexander Alekhin
06547120aa Merge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix 2014-08-05 14:17:06 +00:00
Alexander Alekhin
74d2a6eed1 Merge pull request #3035 from ElenaGvozdeva:ocl_test_fix 2014-08-05 14:16:16 +00:00
vbystricky
774d277c1f Fix error in OpenCl version of meanstddev for continues src and not continues mask 2014-08-05 17:30:06 +04:00
vbystricky
2637b18b67 Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types 2014-08-05 16:34:23 +04:00
Elena Gvozdeva
7999fbf765 fixed ocl_integral 2014-08-05 12:01:28 +04:00
Elena Gvozdeva
f32b52ea8d fixed test for CvtColor RGB -> Luv 2014-08-05 11:54:26 +04:00
Elena Gvozdeva
8c2c3b54d9 fixed ocl tests for BlendLinear, BoxFilter, Integral 2014-08-05 11:41:08 +04:00
Adrian Stratulat
b2acd1f75a Vectorize split & merge for NEON 2014-08-05 06:51:36 +00:00
Vadim Pisarevsky
a05ce00a65 Merge pull request #2879 from alalek:ocl_runtime_flags 2014-08-04 16:43:01 +00:00
Vadim Pisarevsky
a58767eff8 Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix 2014-08-04 14:54:12 +00:00
Vadim Pisarevsky
432b7cb235 Merge pull request #3032 from vpisarev:refactor_ml2 2014-08-04 14:51:38 +00:00
unknown
3fe4980ce1 Double precision for solvePnPRansac() 2014-08-04 14:20:32 +02:00
vbystricky
2d587ad691 Prevent generating test case with mask filled 0 only 2014-08-04 15:12:36 +04:00
Vadim Pisarevsky
cb9b88e65b fixed more compile warnings on Windows 2014-08-04 14:22:31 +04:00
Vadim Pisarevsky
dbedc63c55 Merge pull request #3034 from jet47:fix-compilation 2014-08-04 09:38:34 +00:00
Vladislav Vinogradov
a3da3a01e1 fix test_opencv_imgproc compilation 2014-08-04 12:13:33 +04: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
Alexander Alekhin
add9ce46c3 Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix 2014-08-04 08:09:38 +00:00
Vadim Pisarevsky
222f8a3d5e hopefully fixed test failure on Linux 2014-08-04 01:16:45 +04:00
Vadim Pisarevsky
24b01a8e4f continuing to debug boost and fix MSVC compile errors 2014-08-03 21:21:11 +04:00
Vadim Pisarevsky
98a1181240 fixed the condition 2014-08-03 13:15:43 +04:00
Vadim Pisarevsky
79b593d8d8 more fixes and more debugging code 2014-08-03 13:08:03 +04:00
Vadim Pisarevsky
eeb786fcfd fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code 2014-08-03 12:46:28 +04:00
Vadim Pisarevsky
9cb79b9abb temporarily disabled java bindings for ml; hopefully fixed warnings etc. 2014-08-03 04:28:31 +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
2520e335d1 removed many extra whitespaces; fixed 1 warning 2014-08-03 03:08:25 +04:00
Vadim Pisarevsky
28ca6ac05e fixed building html docs 2014-08-03 02:34:47 +04:00
Vadim Pisarevsky
d3cdfefa03 Merge pull request #3027 from vbystricky:cvtColorLuv2RGB 2014-08-02 21:52:24 +00:00