archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup:

Browse Source 
- remove unused defines.
- quiet some shadow warnings.
- bevel, ifdef out some asserts that are too common.
- style
This commit is contained in:
Campbell Barton
2013-03-25 02:41:30 +00:00
parent 153eea5f23
commit e1a54214bb
34 changed files with 100 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@@ -94,8 +94,6 @@ typedef struct {
*/
/* See the python script above to regenerate the 48x48 icon within blender */
#define BLENDER_ICON_WIDTH 48
#define BLENDER_ICON_HEIGHT 48
static long BLENDER_ICON_48x48x32[] = {
48,48,
4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303,

2
source/blender/blenkernel/BKE_brush.h
View File

@@ -78,7 +78,7 @@ float BKE_brush_sample_tex_3D(const Scene *scene, struct Brush *br, const float
float rgba[4], const int thread, struct ImagePool *pool);
float BKE_brush_sample_tex_2D(const struct Scene *scene, struct Brush *brush, const float xy[2],
float rgba[4]);
float BKE_brush_sample_masktex (const Scene *scene, struct Brush *br,const float point[3],
float BKE_brush_sample_masktex(const Scene *scene, struct Brush *br, const float point[3],
const int thread, struct ImagePool *pool);
void BKE_brush_imbuf_new(const struct Scene *scene, struct Brush *brush, short flt, short texfalloff, int size,
struct ImBuf **imbuf, int use_color_correction);

5
source/blender/blenkernel/intern/brush.c
View File

@@ -585,10 +585,11 @@ float BKE_brush_sample_tex_3D(const Scene *scene, Brush *br,
return intensity;
}
float BKE_brush_sample_masktex (const Scene *scene, Brush *br,
float BKE_brush_sample_masktex(const Scene *scene, Brush *br,
const float point[3],
const int thread,
struct ImagePool *pool) {
struct ImagePool *pool)
{
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
MTex *mtex = &br->mask_mtex;

2
source/blender/blenkernel/intern/dynamicpaint.c
View File

@@ -520,7 +520,7 @@ static int subframe_updateObject(Scene *scene, Object *ob, int flags, int parent
/* if object has parents, update them too */
if (parent_recursion) {
int recursion = parent_recursion-1;
int recursion = parent_recursion - 1;
int is_canvas = 0;
if (ob->parent) is_canvas += subframe_updateObject(scene, ob->parent, 0, recursion, frame);
if (ob->track) is_canvas += subframe_updateObject(scene, ob->track, 0, recursion, frame);

9
source/blender/bmesh/tools/bmesh_bevel.c
View File

@@ -43,11 +43,12 @@
#include "bmesh.h"
#include "./intern/bmesh_private.h"
#define BEVEL_EPSILON_D 1e-6
#define BEVEL_EPSILON 1e-6f
/* happens far too often, uncomment for development */
// #define BEVEL_ASSERT_PROJECT
/* for testing */
// #pragma GCC diagnostic error "-Wpadded"
@@ -369,7 +370,9 @@ static void offset_meet(EdgeHalf *e1, EdgeHalf *e2, BMVert *v, BMFace *f,
/* intersect the lines; by construction they should be on the same plane and not parallel */
if (!isect_line_line_v3(off1a, off1b, off2a, off2b, meetco, isect2)) {
#ifdef BEVEL_ASSERT_PROJECT
BLI_assert(!"offset_meet failure");
#endif
copy_v3_v3(meetco, off1a); /* just to do something */
}
}
@@ -485,7 +488,9 @@ static void project_to_edge(BMEdge *e, const float co_a[3], const float co_b[3],
float otherco[3];
if (!isect_line_line_v3(e->v1->co, e->v2->co, co_a, co_b, projco, otherco)) {
#ifdef BEVEL_ASSERT_PROJECT
BLI_assert(!"project meet failure");
#endif
copy_v3_v3(projco, e->v1->co);
}
}

4
source/blender/collada/collada_utils.cpp
View File

@@ -327,8 +327,8 @@ std::string bc_replace_string(std::string data, const std::string& pattern,
*/
void bc_match_scale(std::vector<Object *> *objects_done,
Scene &sce,
UnitConverter &bc_unit) {
UnitConverter &bc_unit)
{
Object *ob = NULL;
PointerRNA scene_ptr, unit_settings;

2
source/blender/compositor/operations/COM_CompositorOperation.cpp
View File

@@ -176,7 +176,7 @@ void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber)
*/
int full_width = rd->xsch * rd->size / 100;
int full_height =rd->ysch * rd->size / 100;
int full_height = rd->ysch * rd->size / 100;
dx = rd->border.xmin * full_width - (full_width - this->getWidth()) / 2.0f;
dy = rd->border.ymin * full_height - (full_height - this->getHeight()) / 2.0f;

2
source/blender/editors/sculpt_paint/paint_image_2d.c
View File

@@ -793,7 +793,7 @@ void *paint_2d_new_stroke(bContext *C, wmOperator *op)
return s;
}
void paint_2d_redraw (const bContext *C, void *ps, int final)
void paint_2d_redraw(const bContext *C, void *ps, int final)
{
ImagePaintState *s = ps;

3
source/blender/editors/sculpt_paint/paint_stroke.c
View File

@@ -191,7 +191,8 @@ static void paint_brush_update(bContext *C, Brush *brush, PaintMode mode,
if ((brush->mtex.brush_map_mode == MTEX_MAP_MODE_RANDOM)) {
ups->tex_mouse[0] = BLI_frand() * stroke->vc.ar->sizex;
ups->tex_mouse[1] = BLI_frand() * stroke->vc.ar->sizey;;
} else {
}
else {
copy_v2_v2(ups->tex_mouse, mouse);
}
}

1
source/blender/editors/space_file/file_ops.c
View File

@@ -1460,7 +1460,6 @@ static int file_delete_poll(bContext *C)
{
int poll = ED_operator_file_active(C);
SpaceFile *sfile = CTX_wm_space_file(C);
struct direntry *file;
if (sfile && sfile->params) {
char dir[FILE_MAX], group[FILE_MAX];

9
source/blender/editors/uvedit/uvedit_smart_stitch.c
View File

@@ -754,7 +754,8 @@ static void stitch_set_face_preview_buffer_position(BMFace *efa, StitchPreviewer
/* setup face preview for all coincident uvs and their faces */
static void stitch_setup_face_preview_for_uv_group(UvElement *element, StitchState *state, IslandStitchData *island_stitch_data,
PreviewPosition *preview_position) {
PreviewPosition *preview_position)
{
StitchPreviewer *preview = state->stitch_preview;
/* static island does not change so returning immediately */
@@ -774,7 +775,8 @@ static void stitch_setup_face_preview_for_uv_group(UvElement *element, StitchSta
/* checks if uvs are indeed stitchable and registers so that they can be shown in preview */
static void stitch_validate_uv_stichability(UvElement *element, StitchState *state, IslandStitchData *island_stitch_data,
PreviewPosition *preview_position) {
PreviewPosition *preview_position)
{
UvElement *element_iter;
StitchPreviewer *preview = state->stitch_preview;
int vert_index;
@@ -809,7 +811,8 @@ static void stitch_validate_uv_stichability(UvElement *element, StitchState *sta
static void stitch_validate_edge_stichability(UvEdge *edge, StitchState *state, IslandStitchData *island_stitch_data,
PreviewPosition *preview_position) {
PreviewPosition *preview_position)
{
UvEdge *edge_iter = edge->first;
StitchPreviewer *preview = state->stitch_preview;

6
source/blender/imbuf/intern/anim_movie.c
View File

@@ -946,7 +946,8 @@ static int ffmpeg_seek_by_byte(AVFormatContext *pFormatCtx)
}
static ImBuf *ffmpeg_fetchibuf(struct anim *anim, int position,
IMB_Timecode_Type tc) {
IMB_Timecode_Type tc)
{
int64_t pts_to_search = 0;
double frame_rate;
double pts_time_base;
@@ -1303,7 +1304,8 @@ struct ImBuf *IMB_anim_previewframe(struct anim *anim)
struct ImBuf *IMB_anim_absolute(struct anim *anim, int position,
IMB_Timecode_Type tc,
IMB_Proxy_Size preview_size) {
IMB_Proxy_Size preview_size)
{
struct ImBuf *ibuf = NULL;
char head[256], tail[256];
unsigned short digits;

8
source/blender/imbuf/intern/colormanagement.c
View File

@@ -2401,15 +2401,15 @@ void IMB_colormanagement_colorspace_items_add(EnumPropertyItem **items, int *tot
static void partial_buffer_update_rect(ImBuf *ibuf, unsigned char *display_buffer, const float *linear_buffer,
const unsigned char *byte_buffer, int display_stride, int linear_stride,
int linear_offset_x, int linear_offset_y, ColormanageProcessor *cm_processor,
int xmin, int ymin, int xmax, int ymax)
const int xmin, const int ymin, const int xmax, const int ymax)
{
int x, y;
int channels = ibuf->channels;
float dither = ibuf->dither;
ColorSpace *rect_colorspace = ibuf->rect_colorspace;
float *display_buffer_float = NULL;
int width = xmax - xmin;
int height = ymax - ymin;
const int width = xmax - xmin;
const int height = ymax - ymin;
int is_data = ibuf->colormanage_flag & IMB_COLORMANAGE_IS_DATA;
if (dither != 0.0f) {
@@ -2467,7 +2467,7 @@ static void partial_buffer_update_rect(ImBuf *ibuf, unsigned char *display_buffe
width, height, width, display_stride);
}
else {
int i, width = xmax - xmin;
int i;
for (i = ymin; i < ymax; i++) {
int byte_offset = (linear_stride * i + xmin) * 4;

2
source/blender/python/intern/bpy_app_ffmpeg.c
View File

@@ -81,8 +81,10 @@ static PyObject *make_ffmpeg_info(void)
#define SetIntItem(flag) \
PyStructSequence_SET_ITEM(ffmpeg_info, pos++, PyLong_FromLong(flag))
#endif
#ifndef WITH_FFMPEG
#define SetStrItem(str) \
PyStructSequence_SET_ITEM(ffmpeg_info, pos++, PyUnicode_FromString(str))
#endif
#define SetObjItem(obj) \
PyStructSequence_SET_ITEM(ffmpeg_info, pos++, obj)

10
source/blender/python/intern/bpy_library.c
View File

@@ -330,10 +330,10 @@ static PyObject *bpy_lib_exit(BPy_Library *self, PyObject *UNUSED(args))
mainl = BLO_library_append_begin(bmain, &(self->blo_handle), self->relpath);
{
int i = 0, code;
while ((code = BKE_idcode_iter_step(&i))) {
if (BKE_idcode_is_linkable(code)) {
const char *name_plural = BKE_idcode_to_name_plural(code);
int idcode_step = 0, idcode;
while ((idcode = BKE_idcode_iter_step(&idcode_step))) {
if (BKE_idcode_is_linkable(idcode)) {
const char *name_plural = BKE_idcode_to_name_plural(idcode);
PyObject *ls = PyDict_GetItemString(self->dict, name_plural);
// printf("lib: %s\n", name_plural);
if (ls && PyList_Check(ls)) {
@@ -350,7 +350,7 @@ static PyObject *bpy_lib_exit(BPy_Library *self, PyObject *UNUSED(args))
// printf(" %s\n", item_str);
if (item_str) {
ID *id = BLO_library_append_named_part(mainl, &(self->blo_handle), item_str, code);
ID *id = BLO_library_append_named_part(mainl, &(self->blo_handle), item_str, idcode);
if (id) {
#ifdef USE_RNA_DATABLOCKS
PointerRNA id_ptr;

2
source/gameengine/Converter/BL_ActionActuator.cpp
View File

@@ -123,7 +123,7 @@ void BL_ActionActuator::ProcessReplica()
}
void BL_ActionActuator::SetBlendTime (float newtime)
void BL_ActionActuator::SetBlendTime(float newtime)
{
m_blendframe = newtime;
}

2
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@@ -2107,7 +2107,7 @@ struct parentChildLink {
#include "DNA_constraint_types.h"
//XXX #include "BIF_editconstraint.h"
static bPoseChannel *get_active_posechannel2 (Object *ob)
static bPoseChannel *get_active_posechannel2(Object *ob)
{
bArmature *arm= (bArmature*)ob->data;
bPoseChannel *pchan;

2
source/gameengine/Converter/BL_ShapeActionActuator.cpp
View File

@@ -105,7 +105,7 @@ void BL_ShapeActionActuator::ProcessReplica()
m_lastUpdate=-1;
}
void BL_ShapeActionActuator::SetBlendTime (float newtime)
void BL_ShapeActionActuator::SetBlendTime(float newtime)
{
m_blendframe = newtime;
}

2
source/gameengine/Expressions/Value.cpp
View File

@@ -144,7 +144,7 @@ effect: deletes the object
#define VALUE_POS(val1) (val1)->Calc(VALUE_POS_OPERATOR, val1)
STR_String CValue::op2str (VALUE_OPERATOR op)
STR_String CValue::op2str(VALUE_OPERATOR op)
{
//pre:
//ret: the stringrepresentation of operator op

2
source/gameengine/GameLogic/SCA_LogicManager.cpp
View File

@@ -249,7 +249,7 @@ void SCA_LogicManager::UpdateFrame(double curtime, bool frame)
void* SCA_LogicManager::GetActionByName (const STR_String& actname)
void *SCA_LogicManager::GetActionByName(const STR_String& actname)
{
STR_HashedString an = actname;
void** actptr = m_mapStringToActions[an];

2
source/gameengine/Ketsji/KX_FontObject.cpp
View File

@@ -117,7 +117,7 @@ void KX_FontObject::ProcessReplica()
KX_GetActiveScene()->AddFont(this);
}
int GetFontId (VFont *vfont)
int GetFontId(VFont *vfont)
{
PackedFile *packedfile=NULL;
int fontid = -1;

4
source/gameengine/VideoTexture/Exception.cpp
View File

@@ -40,8 +40,8 @@
ExceptionID ErrGeneral, ErrNotFound;
// exception descriptions
ExpDesc errGenerDesc (ErrGeneral, "General Error");
ExpDesc errNFoundDesc (ErrNotFound, "Error description not found");
ExpDesc errGenerDesc(ErrGeneral, "General Error");
ExpDesc errNFoundDesc(ErrNotFound, "Error description not found");

4
source/gameengine/VideoTexture/FilterBase.cpp
View File

@@ -105,7 +105,7 @@ PyObject *Filter_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds)
}
// object deallocation
void Filter_dealloc (PyFilter *self)
void Filter_dealloc(PyFilter *self)
{
// release object attributes
if (self->m_filter != NULL)
@@ -139,7 +139,7 @@ PyObject *Filter_getPrevious (PyFilter *self, void *closure)
// set previous pixel filter object
int Filter_setPrevious (PyFilter *self, PyObject *value, void *closure)
int Filter_setPrevious(PyFilter *self, PyObject *value, void *closure)
{
// if filter object is available
if (self->m_filter != NULL)

4
source/gameengine/VideoTexture/FilterBlueScreen.cpp
View File

@@ -84,7 +84,7 @@ static PyObject *getColor (PyFilter *self, void *closure)
}
// set color
static int setColor (PyFilter *self, PyObject *value, void *closure)
static int setColor(PyFilter *self, PyObject *value, void *closure)
{
// check validity of parameter
if (value == NULL ||
@@ -114,7 +114,7 @@ static PyObject *getLimits (PyFilter *self, void *closure)
}
// set limit
static int setLimits (PyFilter *self, PyObject *value, void *closure)
static int setLimits(PyFilter *self, PyObject *value, void *closure)
{
// check validity of parameter
if (value == NULL ||

4
source/gameengine/VideoTexture/FilterColor.cpp
View File

@@ -130,7 +130,7 @@ static PyObject *getMatrix (PyFilter *self, void *closure)
}
// set color matrix
static int setMatrix (PyFilter *self, PyObject *value, void *closure)
static int setMatrix(PyFilter *self, PyObject *value, void *closure)
{
// matrix to store items
ColorMatrix mat;
@@ -263,7 +263,7 @@ static PyObject *getLevels (PyFilter *self, void *closure)
}
// set color levels
static int setLevels (PyFilter *self, PyObject *value, void *closure)
static int setLevels(PyFilter *self, PyObject *value, void *closure)
{
// matrix to store items
ColorLevel lev;

4
source/gameengine/VideoTexture/FilterNormal.cpp
View File

@@ -76,7 +76,7 @@ static PyObject *getColor (PyFilter *self, void *closure)
}
// set index of color used to calculate normal
static int setColor (PyFilter *self, PyObject *value, void *closure)
static int setColor(PyFilter *self, PyObject *value, void *closure)
{
// check validity of parameter
if (value == NULL || !PyLong_Check(value))
@@ -98,7 +98,7 @@ static PyObject *getDepth (PyFilter *self, void *closure)
}
// set depth
static int setDepth (PyFilter *self, PyObject *value, void *closure)
static int setDepth(PyFilter *self, PyObject *value, void *closure)
{
// check validity of parameter
if (value)

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

@@ -182,8 +182,8 @@ void ImageBase::setFilter (PyFilter * filt)
ExceptionID ImageHasExports;
ExceptionID InvalidColorChannel;
ExpDesc ImageHasExportsDesc (ImageHasExports, "Image has exported buffers, cannot resize");
ExpDesc InvalidColorChannelDesc (InvalidColorChannel, "Invalid or too many color channels specified. At most 4 values within R, G, B, A, 0, 1");
ExpDesc ImageHasExportsDesc(ImageHasExports, "Image has exported buffers, cannot resize");
ExpDesc InvalidColorChannelDesc(InvalidColorChannel, "Invalid or too many color channels specified. At most 4 values within R, G, B, A, 0, 1");
// initialize image data
void ImageBase::init (short width, short height)
@@ -375,7 +375,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)
@@ -514,7 +514,7 @@ PyObject *Image_getScale (PyImage *self, void *closure)
}
// 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))
@@ -536,7 +536,7 @@ PyObject *Image_getFlip (PyImage *self, void *closure)
}
// 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))
@@ -558,7 +558,7 @@ PyObject * Image_getZbuff (PyImage * self, void * closure)
}
// set zbuff
int Image_setZbuff (PyImage * self, PyObject * value, void * closure)
int Image_setZbuff(PyImage *self, PyObject *value, void *closure)
{
// check parameter, report failure
if (value == NULL || !PyBool_Check(value))
@@ -580,7 +580,7 @@ PyObject * Image_getDepth (PyImage * self, void * closure)
}
// set depth
int Image_setDepth (PyImage * self, PyObject * value, void * closure)
int Image_setDepth(PyImage *self, PyObject *value, void *closure)
{
// check parameter, report failure
if (value == NULL || !PyBool_Check(value))
@@ -678,7 +678,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)

2
source/gameengine/VideoTexture/ImageBuff.cpp
View File

@@ -51,7 +51,7 @@ FilterRGB24 defFilter;
// forward declaration;
extern PyTypeObject ImageBuffType;
static int ImageBuff_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
static int ImageBuff_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
{
short width = -1;
short height = -1;

2
source/gameengine/VideoTexture/ImageMix.cpp
View File

@@ -69,7 +69,7 @@ bool ImageMix::setWeight (const char * id, short weight)
ExceptionID ImageSizesNotMatch;
ExpDesc ImageSizesNotMatchDesc (ImageSizesNotMatch, "Image sizes of sources are different");
ExpDesc ImageSizesNotMatchDesc(ImageSizesNotMatch, "Image sizes of sources are different");
// calculate image from sources and set its availability
void ImageMix::calcImage (unsigned int texId, double ts)

24
source/gameengine/VideoTexture/ImageRender.cpp
View File

@@ -52,14 +52,14 @@
ExceptionID SceneInvalid, CameraInvalid, ObserverInvalid;
ExceptionID MirrorInvalid, MirrorSizeInvalid, MirrorNormalInvalid, MirrorHorizontal, MirrorTooSmall;
ExpDesc SceneInvalidDesc (SceneInvalid, "Scene object is invalid");
ExpDesc CameraInvalidDesc (CameraInvalid, "Camera object is invalid");
ExpDesc ObserverInvalidDesc (ObserverInvalid, "Observer object is invalid");
ExpDesc MirrorInvalidDesc (MirrorInvalid, "Mirror object is invalid");
ExpDesc MirrorSizeInvalidDesc (MirrorSizeInvalid, "Mirror has no vertex or no size");
ExpDesc MirrorNormalInvalidDesc (MirrorNormalInvalid, "Cannot determine mirror plane");
ExpDesc MirrorHorizontalDesc (MirrorHorizontal, "Mirror is horizontal in local space");
ExpDesc MirrorTooSmallDesc (MirrorTooSmall, "Mirror is too small");
ExpDesc SceneInvalidDesc(SceneInvalid, "Scene object is invalid");
ExpDesc CameraInvalidDesc(CameraInvalid, "Camera object is invalid");
ExpDesc ObserverInvalidDesc(ObserverInvalid, "Observer object is invalid");
ExpDesc MirrorInvalidDesc(MirrorInvalid, "Mirror object is invalid");
ExpDesc MirrorSizeInvalidDesc(MirrorSizeInvalid, "Mirror has no vertex or no size");
ExpDesc MirrorNormalInvalidDesc(MirrorNormalInvalid, "Cannot determine mirror plane");
ExpDesc MirrorHorizontalDesc(MirrorHorizontal, "Mirror is horizontal in local space");
ExpDesc MirrorTooSmallDesc(MirrorTooSmall, "Mirror is too small");
// constructor
ImageRender::ImageRender (KX_Scene * scene, KX_Camera * camera) :
@@ -294,7 +294,7 @@ BlendType<KX_Camera> cameraType ("KX_Camera");
// object initialization
static int ImageRender_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
static int ImageRender_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
{
// parameters - scene object
PyObject *scene;
@@ -347,7 +347,7 @@ static PyObject *getBackground (PyImage *self, void *closure)
}
// set color
static int setBackground (PyImage *self, PyObject *value, void *closure)
static int setBackground(PyImage *self, PyObject *value, void *closure)
{
// check validity of parameter
if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 4
@@ -441,7 +441,7 @@ PyTypeObject ImageRenderType =
};
// object initialization
static int ImageMirror_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
static int ImageMirror_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
{
// parameters - scene object
PyObject *scene;
@@ -523,7 +523,7 @@ static PyObject *getClip (PyImage *self, void *closure)
}
// set clip
static int setClip (PyImage *self, PyObject *value, void *closure)
static int setClip(PyImage *self, PyObject *value, void *closure)
{
// check validity of parameter
double clip;

8
source/gameengine/VideoTexture/ImageViewport.cpp
View File

@@ -210,7 +210,7 @@ PyObject *ImageViewport_getWhole (PyImage *self, void *closure)
}
// set whole
int ImageViewport_setWhole (PyImage *self, PyObject *value, void *closure)
int ImageViewport_setWhole(PyImage *self, PyObject *value, void *closure)
{
// check parameter, report failure
if (value == NULL || !PyBool_Check(value))
@@ -240,7 +240,7 @@ PyObject *ImageViewport_getAlpha (PyImage *self, void *closure)
}
// set whole
int ImageViewport_setAlpha (PyImage *self, PyObject *value, void *closure)
int ImageViewport_setAlpha(PyImage *self, PyObject *value, void *closure)
{
// check parameter, report failure
if (value == NULL || !PyBool_Check(value))
@@ -266,7 +266,7 @@ static PyObject *ImageViewport_getPosition (PyImage *self, void *closure)
}
// set position
static int ImageViewport_setPosition (PyImage *self, PyObject *value, void *closure)
static int ImageViewport_setPosition(PyImage *self, PyObject *value, void *closure)
{
// check validity of parameter
if (value == NULL ||
@@ -299,7 +299,7 @@ PyObject *ImageViewport_getCaptureSize (PyImage *self, void *closure)
}
// set capture size
int ImageViewport_setCaptureSize (PyImage *self, PyObject *value, void *closure)
int ImageViewport_setCaptureSize(PyImage *self, PyObject *value, void *closure)
{
// check validity of parameter
if (value == NULL ||

10
source/gameengine/VideoTexture/Texture.cpp
View File

@@ -68,7 +68,7 @@ BlendType<KX_LightObject> lightObjectType ("KX_LightObject");
// load texture
void loadTexture (unsigned int texId, unsigned int * texture, short * size,
void loadTexture(unsigned int texId, unsigned int *texture, short *size,
bool mipmap)
{
// load texture for rendering
@@ -171,8 +171,8 @@ static PyObject *Texture_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
// forward declaration
PyObject *Texture_close(Texture * self);
int Texture_setSource (Texture * self, PyObject *value, void *closure);
PyObject *Texture_close(Texture *self);
int Texture_setSource(Texture *self, PyObject *value, void *closure);
// Texture object deallocation
@@ -191,7 +191,7 @@ static void Texture_dealloc(Texture *self)
ExceptionID MaterialNotAvail;
ExpDesc MaterialNotAvailDesc (MaterialNotAvail, "Texture material is not available");
ExpDesc MaterialNotAvailDesc(MaterialNotAvail, "Texture material is not available");
// Texture object initialization
static int Texture_init(Texture *self, PyObject *args, PyObject *kwds)
@@ -439,7 +439,7 @@ static PyObject *Texture_getSource(Texture *self, PyObject *value, void *closure
// set source object
int Texture_setSource (Texture * self, PyObject *value, void *closure)
int Texture_setSource(Texture *self, PyObject *value, void *closure)
{
// check new value
if (value == NULL || !pyImageTypes.in(Py_TYPE(value)))

6
source/gameengine/VideoTexture/VideoBase.cpp
View File

@@ -102,11 +102,11 @@ void VideoBase::process (BYTE * sample)
// exceptions for video source initialization
ExceptionID SourceVideoEmpty, SourceVideoCreation;
ExpDesc SourceVideoEmptyDesc (SourceVideoEmpty, "Source Video is empty");
ExpDesc SourceVideoCreationDesc (SourceVideoCreation, "SourceVideo object was not created");
ExpDesc SourceVideoEmptyDesc(SourceVideoEmpty, "Source Video is empty");
ExpDesc SourceVideoCreationDesc(SourceVideoCreation, "SourceVideo object was not created");
// open video source
void Video_open (VideoBase * self, char * file, short captureID)
void Video_open(VideoBase * self, char * file, short captureID)
{
// if file is empty, throw exception
if (file == NULL) THRWEXCP(SourceVideoEmpty, S_OK);

4
source/gameengine/VideoTexture/VideoFFmpeg.cpp
View File

@@ -1085,7 +1085,7 @@ inline VideoFFmpeg * getVideoFFmpeg (PyImage *self)
// object initialization
static int VideoFFmpeg_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
static int VideoFFmpeg_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
{
PyImage *self = reinterpret_cast<PyImage*>(pySelf);
// parameters - video source
@@ -1243,7 +1243,7 @@ PyTypeObject VideoFFmpegType =
};
// object initialization
static int ImageFFmpeg_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
static int ImageFFmpeg_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
{
PyImage *self = reinterpret_cast<PyImage*>(pySelf);
// parameters - video source