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

Merged the trunk r8589:8653 - all changes related to build warnings

Browse Source
This commit is contained in:
Andrey Kamaev
2012-06-15 13:04:17 +00:00
parent 73c152abc4
commit bd0e0b5800
438 changed files with 20374 additions and 19674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,15 +198,25 @@ static Py_ssize_t what_size(PyObject *o)
/************************************************************************/
CvMat *PyCvMat_AsCvMat(PyObject *o)
static CvMat *PyCvMat_AsCvMat(PyObject *o)
{
assert(0); // not yet implemented: reference counting for CvMat in Kalman is unclear...
return NULL;
}
#define cvReleaseIplConvKernel(x) cvReleaseStructuringElement(x)
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( push )
#pragma warning( disable : 4244 )
#endif
#include "generated3.i"
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( pop )
#endif
/* iplimage */
static void iplimage_dealloc(PyObject *self)
@@ -388,7 +398,8 @@ static PyObject *cvmat_tostring(PyObject *self, PyObject *args)
bps = CV_MAT_CN(m->type) * 8;
break;
default:
return failmsg("Unrecognised depth %d", CV_MAT_DEPTH(m->type)), (PyObject*)0;
failmsg("Unrecognized depth %d", CV_MAT_DEPTH(m->type));
return (PyObject*)0;
}
int bpl = m->cols * bps; // bytes per line
@@ -908,19 +919,19 @@ static PyTypeObject memtrack_Type = {
sizeof(memtrack_t), /*basicsize*/
};
Py_ssize_t memtrack_getreadbuffer(PyObject *self, Py_ssize_t segment, void **ptrptr)
static Py_ssize_t memtrack_getreadbuffer(PyObject *self, Py_ssize_t segment, void **ptrptr)
{
*ptrptr = &((memtrack_t*)self)->ptr;
return ((memtrack_t*)self)->size;
}
Py_ssize_t memtrack_getwritebuffer(PyObject *self, Py_ssize_t segment, void **ptrptr)
static Py_ssize_t memtrack_getwritebuffer(PyObject *self, Py_ssize_t segment, void **ptrptr)
{
*ptrptr = ((memtrack_t*)self)->ptr;
return ((memtrack_t*)self)->size;
}
Py_ssize_t memtrack_getsegcount(PyObject *self, Py_ssize_t *lenp)
static Py_ssize_t memtrack_getsegcount(PyObject *self, Py_ssize_t *lenp)
{
return (Py_ssize_t)1;
}
@@ -3800,7 +3811,7 @@ static int zero = 0;
#define CVPY_VALIDATE_DrawChessboardCorners() do { \
if ((patternSize.width * patternSize.height) != corners.count) \
return (PyObject*)failmsg("Size is %dx%d, but corner list is length %d", patternSize.width, patternSize.height, corners.count); \
return (PyObject*)0; \
} while (0)
#define cvGetRotationMatrix2D cv2DRotationMatrix
@@ -3839,8 +3850,17 @@ static double cppKMeans(const CvArr* _samples, int cluster_count, CvArr* _labels
#define cvKMeans2(samples, nclusters, labels, termcrit, attempts, flags, centers) \
cppKMeans(samples, nclusters, labels, termcrit, attempts, flags, centers)
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( push )
#pragma warning( disable : 4244 )
#endif
#include "generated0.i"
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( pop )
#endif
static PyMethodDef old_methods[] = {
#if PYTHON_USE_NUMPY
@@ -3858,7 +3878,7 @@ static PyMethodDef old_methods[] = {
/************************************************************************/
/* Module init */
PyObject* init_cv()
static PyObject* init_cv()
{
PyObject *m, *d;
cvSetErrMode(CV_ErrModeParent);