Commit Graph

86 Commits

Author SHA1 Message Date
Vadim Pisarevsky 1176d4ef84 fixed some more compile errors and test failures 2014-10-17 15:02:56 +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
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Kirill Kornyakov aef347e7b3 Removed references to opencv.itseez.com 2013-06-28 12:48:12 +04:00
Andrey Kamaev f886651cf0 Drop old python samples and tests 2013-04-12 19:37:40 +04:00
Andrey Kamaev 3b364330ad Merge branch '2.4' 2013-04-12 15:35:38 +04:00
Roman Donchenko 57d4c86b2b Fixed the shebang lines on the Python scripts.
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
2013-04-11 18:37:23 +04:00
Andrey Kamaev 20534c9beb Merge pull request #692 from vpisarev:refactor_calib3d_stereo 2013-03-26 18:38:16 +04:00
Vadim Pisarevsky f8b61e4eca fixed hopefully last warnings in the doc builder 2013-03-25 12:04:11 +04:00
Vadim Pisarevsky 44157c421f fixed python test failures (modified stereo correspondence test to use cv2.* stuff), fixed docs 2013-03-25 00:42:46 +04:00
Andrey Kamaev 707d3e0a62 Python wrapper is adapted for cv::String 2013-03-22 22:14:30 +04:00
Andrey Kamaev b44b920997 Merge branch '2.4' 2013-02-12 16:30:18 +04:00
Vadim Pisarevsky 43d61d961e fixed problem with Nx2 numpy arrays in geometrical functions (#2783) 2013-02-08 18:11:56 +04:00
Vadim Pisarevsky 82b6419d12 added tests for fast (ticket #2613) and estimateAffine3D (#2375) 2013-01-31 16:15:40 +04:00
Vadim Pisarevsky abd9675a99 fixed bugs #1718, #2375; attached the new tests to test.py. 2013-01-31 15:34:09 +04:00
Vadim Pisarevsky 4044fbcb33 hopefully fixed handling of 'long' Python type in OpenCV bindings (bug #2193). added the corresponding test 2013-01-28 21:03:59 +04:00
Vadim Pisarevsky a519bbc617 Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658. Added tests for #2611, #2505, #2658 2013-01-28 20:44:47 +04:00
marina.kolpakova 285d6320be add #/usr/bin/env python to all python files 2012-11-23 22:57:22 +04:00
Vadim Pisarevsky ae10ecd264 fixed 2 test failures (test_DrawChessboardCorners & Core_Array.expressions) 2012-10-24 14:41:15 +04:00
OpenCV Buildbot 04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Evgeny Talanin 19313923cc Use github pat to get data for in python tests (files from code.opencv.org are received truncated sometimes) 2012-08-10 14:09:58 +04:00
Evgeny Talanin 064d022a4b Set correct path to repo in python tests (changed after migration to git) 2012-08-03 17:50:55 +04:00
Vadim Pisarevsky d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Ilya Lysenkov 4a7efa548f Added points comparison in test_remap 2012-03-26 11:07:27 +00:00
Ilya Lysenkov 159022844e Restored and improved the test_remap Python test 2012-03-26 10:25:24 +00:00
Alexander Shishkov d95127c279 #1672
updated some more links
2012-03-11 16:01:20 +00:00
Alexander Shishkov be63ce723f #1672
updated links in cheatsheet
renamed directory for Mat tutorial 
changed links from willow docs to opencv.itseez.com, from Trac to current Redmine
2012-03-11 14:35:46 +00:00
Vadim Pisarevsky 9469f65094 added tests on cv.CreateImage() (thanks to mythsmith). 2012-01-25 13:32:48 +00:00
Vadim Pisarevsky e2e4ee2f53 disable implicit numpy array use in old-style Python bindings because of hard-to-fix memory leaks (ticket #1177) 2011-08-06 20:15:29 +00:00
Vadim Pisarevsky 569b1ad582 embeded cv Python module into cv2. 2011-07-12 12:56:03 +00:00
Vadim Pisarevsky cc9a1bb62f propagated some more fixes from 2.3 branch to the trunk 2011-06-30 12:06:26 +00:00
Vadim Pisarevsky 49467947ac propagated some fixes from 2.3 to trunk 2011-06-23 12:00:09 +00:00
Vadim Pisarevsky 0c504b42a0 copied helper modules from doc to modules/python/test 2011-05-17 15:52:23 +00:00
Vadim Pisarevsky 7f7965bc93 separated opencv 1.x and opencv 2.x wrappers. moved tests/python/* to modules/python/test 2011-05-03 16:00:31 +00:00