mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,165 Commits 6 Branches 126 Tags 3 GiB
7ecad71ab0
Commit Graph

14165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edgarriba
7ecad71ab0 fixed warnings 2014-08-09 17:18:47 +02:00
edgarriba
8c4b8cc0b4 fixed warnings 2014-08-09 17:14:24 +02:00
edgarriba
3f5d3b2d40 video opening path modified 2014-08-08 15:36:27 +02:00
edgarriba
f8c5acee4c modified number test points 2014-08-08 15:20:38 +02:00
edgarriba
7d8a16ae39 remove unused tutorials 2014-08-08 14:45:43 +02:00
edgarriba
8b732e086d updated ransanc model 2014-08-08 13:52:15 +02:00
edgarriba
c07cd007eb Multi class tutorial compilation 2014-08-08 11:46:26 +02:00
edgarriba
e5a91a8be8 Modification Ransac model points 2014-08-07 14:59:01 +02:00
edgarriba
8c08258cf2 moved headers 2014-08-07 13:06:24 +02:00
edgarriba
3a2cf37115 fixed conflicts 2014-08-07 12:41:47 +02:00
edgarriba
837f001789 update cmake 2014-08-07 11:55:17 +02:00
edgarriba
381574bdb7 Modified cmake 2014-08-07 11:33:32 +02: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
edgarriba
f1b6809eee Updated Utils functions 2014-08-06 10:05:26 +02:00
edgarriba
2881f2a096 Fixed warnings 2014-08-06 09:21:38 +02:00
edgarriba
d2665b655e Fixed warnings 2014-08-06 08:41:14 +02: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
edgarriba
e14f91dd37 Update headers 2014-08-06 08:18:11 +02:00
edgarriba
ddf5c86f3a Added code 2014-08-06 08:12:55 +02:00
edgarriba
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
 2014-08-06 08:11:03 +02:00
Michael Pratt
218b12c557 Merge branch 'master' into python2and3 2014-08-06 01:45:07 -04:00
edgarriba
43301096d3 Update tutorial 2014-08-05 20:06:47 +02: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
edgarriba
7b0be9cf8f Update code 2014-08-05 17:27:20 +02:00
edgarriba
0d2bc9b0a1 Removed whitespaces 2014-08-05 17:02:06 +02:00
edgarriba
2353436cb5 Removed whitespace 2014-08-05 16:53:30 +02:00
Alexander Alekhin
d2f1c00719 Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix 2014-08-05 14:52:22 +00:00
edgarriba
4447dbe265 Removed whitespace 2014-08-05 16:41:07 +02: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
edgarriba
e3afc32693 Removed whitespace 2014-08-05 16:16:05 +02:00
edgarriba
55819ae464 Tutorial code restructure 2014-08-05 15:48:54 +02: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
edgarriba
23785faf02 Update for NON BOOST libraries 2014-08-05 14:47:06 +02:00
vbystricky
2637b18b67 Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types 2014-08-05 16:34:23 +04:00
edgarriba
16e750dd37 Update for Boost libraries 2014-08-05 14:02:23 +02:00
edgarriba
1727e0acf6 Update for Boost libraries 2014-08-05 14:00:23 +02:00
edgarriba
dfa3ccdea9 Update for Boost libraries 2014-08-05 13:43:01 +02:00