generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged 2.4 into trunk

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/python/src2/cv2.cv.hpp
View File

@@ -3383,7 +3383,7 @@ static PyObject *pycvCalcEMD2(PyObject *self, PyObject *args, PyObject *kw)
PyObject *pyobj_cost_matrix = NULL;
CvArr* flow=NULL;
PyObject *pyobj_flow = NULL;
float lower_bound = 0.0;
float lower_bound = FLT_MAX;
PyObject *userdata = NULL;
if (!PyArg_ParseTupleAndKeywords(args, kw, "OOi|OOOfO", (char**)keywords,
@@ -3888,7 +3888,7 @@ PyObject* init_cv()
m = Py_InitModule(OLD_MODULESTR, old_methods);
d = PyModule_GetDict(m);
PyDict_SetItemString(d, "__version__", PyString_FromString("$Rev: 4557 $"));
PyDict_SetItemString(d, "__version__", PyString_FromString(CV_VERSION));
PyDict_SetItemString(d, "error", opencv_error);
// Couple of warnings about strict aliasing here. Not clear how to fix.