Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2012-09-16 04:58:18 +00:00
parent c2a1dcf621
commit 2fb8292005
222 changed files with 1480 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/gameengine/VideoTexture/ImageBase.cpp
View File

@@ -128,7 +128,7 @@ PyImage * ImageBase::getSource (const char * id)
// set source object
bool ImageBase::setSource (const char * id, PyImage * source)
bool ImageBase::setSource (const char * id, PyImage *source)
{
// find source
ImageSourceList::iterator src = findSource(id);
@@ -315,7 +315,7 @@ bool ImageSource::is (const char * id)
// set source object
void ImageSource::setSource (PyImage * source)
void ImageSource::setSource (PyImage *source)
{
// reference new source
if (source != NULL) Py_INCREF(source);
@@ -358,10 +358,10 @@ PyTypeList pyImageTypes;
// functions for python interface
// object allocation
PyObject * Image_allocNew (PyTypeObject * type, PyObject * args, PyObject * kwds)
PyObject *Image_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds)
{
// allocate object
PyImage * self = reinterpret_cast<PyImage*>(type->tp_alloc(type, 0));
PyImage *self = reinterpret_cast<PyImage*>(type->tp_alloc(type, 0));
// initialize object structure
self->m_image = NULL;
// return allocated object
@@ -369,7 +369,7 @@ PyObject * Image_allocNew (PyTypeObject * type, PyObject * args, PyObject * kwds
}
// object deallocation
void Image_dealloc (PyImage * self)
void Image_dealloc (PyImage *self)
{
// release object attributes
if (self->m_image != NULL)
@@ -388,7 +388,7 @@ void Image_dealloc (PyImage * self)
}
// get image data
PyObject * Image_getImage (PyImage * self, char * mode)
PyObject *Image_getImage (PyImage *self, char * mode)
{
try
{
@@ -463,7 +463,7 @@ PyObject * Image_getImage (PyImage * self, char * mode)
}
}
}
return (PyObject*)buffer;
return (PyObject *)buffer;
}
}
catch (Exception & exp)
@@ -475,28 +475,28 @@ PyObject * Image_getImage (PyImage * self, char * mode)
}
// get image size
PyObject * Image_getSize (PyImage * self, void * closure)
PyObject *Image_getSize (PyImage *self, void *closure)
{
return Py_BuildValue("(hh)", self->m_image->getSize()[0],
self->m_image->getSize()[1]);
}
// refresh image
PyObject * Image_refresh (PyImage * self)
PyObject *Image_refresh (PyImage *self)
{
self->m_image->refresh();
Py_RETURN_NONE;
}
// get scale
PyObject * Image_getScale (PyImage * self, void * closure)
PyObject *Image_getScale (PyImage *self, void *closure)
{
if (self->m_image != NULL && self->m_image->getScale()) Py_RETURN_TRUE;
else Py_RETURN_FALSE;
}
// set scale
int Image_setScale (PyImage * self, PyObject * value, void * closure)
int Image_setScale (PyImage *self, PyObject *value, void *closure)
{
// check parameter, report failure
if (value == NULL || !PyBool_Check(value))
@@ -511,14 +511,14 @@ int Image_setScale (PyImage * self, PyObject * value, void * closure)
}
// get flip
PyObject * Image_getFlip (PyImage * self, void * closure)
PyObject *Image_getFlip (PyImage *self, void *closure)
{
if (self->m_image != NULL && self->m_image->getFlip()) Py_RETURN_TRUE;
else Py_RETURN_FALSE;
}
// set flip
int Image_setFlip (PyImage * self, PyObject * value, void * closure)
int Image_setFlip (PyImage *self, PyObject *value, void *closure)
{
// check parameter, report failure
if (value == NULL || !PyBool_Check(value))
@@ -534,7 +534,7 @@ int Image_setFlip (PyImage * self, PyObject * value, void * closure)
// get filter source object
PyObject * Image_getSource (PyImage * self, PyObject * args)
PyObject *Image_getSource (PyImage *self, PyObject *args)
{
// get arguments
char * id;
@@ -543,7 +543,7 @@ PyObject * Image_getSource (PyImage * self, PyObject * args)
if (self->m_image != NULL)
{
// get source object
PyObject * src = reinterpret_cast<PyObject*>(self->m_image->getSource(id));
PyObject *src = reinterpret_cast<PyObject*>(self->m_image->getSource(id));
// if source is available
if (src != NULL)
{
@@ -558,11 +558,11 @@ PyObject * Image_getSource (PyImage * self, PyObject * args)
// set filter source object
PyObject * Image_setSource (PyImage * self, PyObject * args)
PyObject *Image_setSource (PyImage *self, PyObject *args)
{
// get arguments
char * id;
PyObject * obj;
PyObject *obj;
if (!PyArg_ParseTuple(args, "sO:setSource", &id, &obj))
return NULL;
if (self->m_image != NULL)
@@ -593,7 +593,7 @@ PyObject * Image_setSource (PyImage * self, PyObject * args)
// get pixel filter object
PyObject * Image_getFilter (PyImage * self, void * closure)
PyObject *Image_getFilter (PyImage *self, void *closure)
{
// if image object is available
if (self->m_image != NULL)
@@ -614,7 +614,7 @@ PyObject * Image_getFilter (PyImage * self, void * closure)
// set pixel filter object
int Image_setFilter (PyImage * self, PyObject * value, void * closure)
int Image_setFilter (PyImage *self, PyObject *value, void *closure)
{
// if image object is available
if (self->m_image != NULL)
@@ -632,7 +632,7 @@ int Image_setFilter (PyImage * self, PyObject * value, void * closure)
// return success
return 0;
}
PyObject * Image_valid(PyImage * self, void * closure)
PyObject *Image_valid(PyImage *self, void *closure)
{
if (self->m_image->isImageAvailable())
{
@@ -674,7 +674,7 @@ static int Image_getbuffer(PyImage *self, Py_buffer *view, int flags)
self->m_image->m_exports++;
return 0;
}
ret = PyBuffer_FillInfo(view, (PyObject*)self, image, self->m_image->getBuffSize(), 0, flags);
ret = PyBuffer_FillInfo(view, (PyObject *)self, image, self->m_image->getBuffSize(), 0, flags);
if (ret >= 0)
self->m_image->m_exports++;
return ret;
@@ -684,7 +684,7 @@ error:
// The bug is fixed in Python SVN 77916, as soon as the python revision used by Blender is
// updated, you can simply return -1 and set the error
static char* buf = (char *)"";
ret = PyBuffer_FillInfo(view, (PyObject*)self, buf, 0, 0, flags);
ret = PyBuffer_FillInfo(view, (PyObject *)self, buf, 0, 0, flags);
if (ret >= 0)
self->m_image->m_exports++;
return ret;