Merge branch 'master' of https://github.com/nevion/opencv into cc
This commit is contained in:
@@ -410,7 +410,7 @@ static bool pyopencv_to(PyObject* obj, bool& value, const char* name = "<unknown
|
||||
|
||||
static PyObject* pyopencv_from(size_t value)
|
||||
{
|
||||
return PyLong_FromUnsignedLong((unsigned long)value);
|
||||
return PyLong_FromSize_t(value);
|
||||
}
|
||||
|
||||
static bool pyopencv_to(PyObject* obj, size_t& value, const char* name = "<unknown>")
|
||||
@@ -497,9 +497,16 @@ static bool pyopencv_to(PyObject* obj, float& value, const char* name = "<unknow
|
||||
|
||||
static PyObject* pyopencv_from(int64 value)
|
||||
{
|
||||
return PyFloat_FromDouble((double)value);
|
||||
return PyLong_FromLongLong(value);
|
||||
}
|
||||
|
||||
#if !defined(__LP64__)
|
||||
static PyObject* pyopencv_from(uint64 value)
|
||||
{
|
||||
return PyLong_FromUnsignedLongLong(value);
|
||||
}
|
||||
#endif
|
||||
|
||||
static PyObject* pyopencv_from(const string& value)
|
||||
{
|
||||
return PyString_FromString(value.empty() ? "" : value.c_str());
|
||||
|
Reference in New Issue
Block a user