[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19325] branches/blender2.5/blender/source /blender: 2.50: some warning fixes.
Brecht Van Lommel
brecht at blender.org
Tue Mar 17 23:27:16 CET 2009
Revision: 19325
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19325
Author: blendix
Date: 2009-03-17 23:27:15 +0100 (Tue, 17 Mar 2009)
Log Message:
-----------
2.50: some warning fixes.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/BKE_ipo.h
branches/blender2.5/blender/source/blender/blenkernel/intern/seqeffects.c
branches/blender2.5/blender/source/blender/blenlib/intern/storage.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
branches/blender2.5/blender/source/blender/editors/space_file/file_header.c
branches/blender2.5/blender/source/blender/editors/space_file/filelist.c
branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c
branches/blender2.5/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/blender2.5/blender/source/blender/python/intern/bpy_opwrapper.c
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/yafray/intern/export_ri.cpp
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_ipo.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_ipo.h 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_ipo.h 2009-03-17 22:27:15 UTC (rev 19325)
@@ -38,7 +38,7 @@
struct Main;
struct Ipo;
-void do_versions_ipo_to_animato(struct Main *main);
+void do_versions_ipos_to_animato(struct Main *main);
/* --------------------- xxx stuff ------------------------ */
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/seqeffects.c 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/seqeffects.c 2009-03-17 22:27:15 UTC (rev 19325)
@@ -1038,8 +1038,8 @@
} else {
do_gammacross_effect_byte(
facf0, facf1, x, y,
- (char*) ibuf1->rect, (char*) ibuf2->rect,
- (char*) out->rect);
+ (unsigned char*) ibuf1->rect, (unsigned char*) ibuf2->rect,
+ (unsigned char*) out->rect);
}
}
@@ -1996,7 +1996,7 @@
float xs,ys,factxScale,factyScale,tx,ty,rad,s,c,xaux,yaux,factRot,px,py;
TransformVars *scale;
- struct RenderData *rd = NULL; // XXX 2.5 global: &G.scene->r;
+ // XXX struct RenderData *rd = NULL; // 2.5 global: &G.scene->r;
scale = (TransformVars *)seq->effectdata;
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/storage.c 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/storage.c 2009-03-17 22:27:15 UTC (rev 19325)
@@ -334,7 +334,6 @@
char size[250];
static char * types[8] = {"---", "--x", "-w-", "-wx", "r--", "r-x", "rw-", "rwx"};
int num, mode;
- off_t num1, num2, num3, num4, num5;
#ifdef WIN32
__int64 st_size;
#else
@@ -403,10 +402,10 @@
st_size= (off_t)files[num].s.st_size;
if (st_size > 1024*1024*1024) {
- sprintf(files[num].size, "%.2f GB", st_size/(1024*1024*1024));
+ sprintf(files[num].size, "%.2f GB", ((double)st_size)/(1024*1024*1024));
}
else if (st_size > 1024*1024) {
- sprintf(files[num].size, "%.1f MB", st_size/(1024*1024));
+ sprintf(files[num].size, "%.1f MB", ((double)st_size)/(1024*1024));
}
else if (st_size > 1024) {
sprintf(files[num].size, "%d KB", (int)(st_size/1024));
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c 2009-03-17 22:27:15 UTC (rev 19325)
@@ -702,9 +702,6 @@
void ED_area_swapspace(bContext *C, ScrArea *sa1, ScrArea *sa2)
{
- SpaceType *st;
- SpaceLink *sl;
- SpaceLink *slold;
ScrArea *tmp= MEM_callocN(sizeof(ScrArea), "addscrarea");
ED_area_exit(C, sa1);
Modified: branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c 2009-03-17 22:27:15 UTC (rev 19325)
@@ -550,7 +550,6 @@
static void file_draw_fsmenu_category(const bContext *C, ARegion *ar, FSMenuCategory category, const char* category_name, short *starty)
{
- SpaceFile *sfile= (SpaceFile*)CTX_wm_space_data(C);
struct FSMenu* fsmenu = fsmenu_get();
char bookmark[FILE_MAX];
int nentries = fsmenu_get_nentries(fsmenu, category);
Modified: branches/blender2.5/blender/source/blender/editors/space_file/file_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_header.c 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_header.c 2009-03-17 22:27:15 UTC (rev 19325)
@@ -67,36 +67,6 @@
/* ************************ header area region *********************** */
-static void do_viewmenu(bContext *C, void *arg, int event)
-{
-}
-
-static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
- ScrArea *curarea= CTX_wm_area(C);
- uiBlock *block;
- short yco= 0, menuwidth=120;
-
- block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP, UI_HELV);
- uiBlockSetButmFunc(block, do_viewmenu, NULL);
-
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20,
- menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
-
- if(curarea->headertype==HEADERTOP) {
- uiBlockSetDirection(block, UI_DOWN);
- }
- else {
- uiBlockSetDirection(block, UI_TOP);
- uiBlockFlipOrder(block);
- }
-
- uiTextBoundsBlock(block, 50);
- uiEndBlock(C, block);
-
- return block;
-}
-
static void do_file_header_buttons(bContext *C, void *arg, int event)
{
SpaceFile *sfile= (SpaceFile*)CTX_wm_space_data(C);
Modified: branches/blender2.5/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/filelist.c 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/editors/space_file/filelist.c 2009-03-17 22:27:15 UTC (rev 19325)
@@ -274,7 +274,6 @@
void filelist_filter(FileList* filelist)
{
- char dir[FILE_MAX], group[GROUP_MAX];
int num_filtered = 0;
int i, j;
@@ -667,7 +666,6 @@
void filelist_readdir(struct FileList* filelist)
{
char wdir[FILE_MAX];
- int finished = 0;
int i;
if (!filelist) return;
Modified: branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c 2009-03-17 22:27:15 UTC (rev 19325)
@@ -78,11 +78,6 @@
return 1;
}
-static int text_valid_poll(bContext *C)
-{
- return CTX_data_edit_text(C) ? 1:0;
-}
-
static int text_edit_poll(bContext *C)
{
Text *text= CTX_data_edit_text(C);
Modified: branches/blender2.5/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- branches/blender2.5/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2009-03-17 22:27:15 UTC (rev 19325)
@@ -861,7 +861,6 @@
for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i)
{
- const Channel &channel = i.channel();
const char *str= i.name();
int len= strlen(str);
if(len) {
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_opwrapper.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_opwrapper.c 2009-03-17 22:03:21 UTC (rev 19324)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_opwrapper.c 2009-03-17 22:27:15 UTC (rev 19325)
@@ -299,6 +299,7 @@
{
PyOperatorType *pyot = (PyOperatorType *)userdata;
PyObject *py_class = pyot->py_class;
+ PyObject *props, *item;
/* identifiers */
ot->name= pyot->name;
@@ -316,7 +317,6 @@
ot->pyop_data= userdata;
// TODO - set properties
- PyObject *props, *item;
if ((props=PyObject_GetAttrString(py_class, "properties"))) {
@@ -325,10 +325,10 @@
int i;
for(i=0; i<PyList_Size(props); i++) {
+ PyObject *py_func_ptr, *py_kw, *py_srna_cobject, *py_ret;
+
item = PyList_GET_ITEM(props, i);
- PyObject *py_func_ptr, *py_kw, *py_srna_cobject, *py_ret;
-
if (PyArg_ParseTuple(item, "O!O!", &PyCObject_Type, &py_func_ptr, &PyDict_Type, &py_kw)) {
PyObject *(*pyfunc)(PyObject *, PyObject *, PyObject *);
@@ -372,8 +372,10 @@
char *description= NULL;
static char *pyop_func_names[] = {"exec", "invoke", "poll", NULL};
- static int *pyop_func_nargs[] = {1, 2, 2, 0};
+ static int pyop_func_nargs[] = {1, 2, 2, 0};
+ int i;
+ int argcount;
if (!PyArg_ParseTuple(args, "O", &value) || !PyObject_IsSubclass(value, optype)) {
PyErr_SetString( PyExc_AttributeError, "expected Operator subclass of bpy.types.Operator");
@@ -386,7 +388,7 @@
Py_DECREF(item);
if (WM_operatortype_find(idname)) {
- PyErr_Format( PyExc_AttributeError, "Operator alredy exists with this name", idname);
+ PyErr_Format( PyExc_AttributeError, "Operator already exists with this name: %s", idname);
return NULL;
}
@@ -412,10 +414,10 @@
Py_DECREF(item);
/* Check known functions and argument lengths */
- int i;
- int argcount;
for (i=0; pyop_func_names[i]; i++) {
- if (item=PyObject_GetAttrString(value, pyop_func_names[i])) {
+ if ((item=PyObject_GetAttrString(value, pyop_func_names[i]))) {
+ PyObject *pyargcount;
+
/* check its callable */
if (!PyFunction_Check(item)) {
PyErr_Format(PyExc_ValueError, "Cant register operator class - %s.%s() is not a function", idname, pyop_func_names[i]);
@@ -425,7 +427,7 @@
/* check the number of args is correct */
// MyClass.exec.func_code.co_argcount
- PyObject *pyargcount = PyObject_GetAttrString(PyFunction_GetCode(item), "co_argcount");
+ pyargcount = PyObject_GetAttrString(PyFunction_GetCode(item), "co_argcount");
argcount = PyLong_AsSsize_t(pyargcount);
Py_DECREF(pyargcount);
@@ -444,13 +446,14 @@
/* If we have properties set, check its a list of dicts */
item = PyObject_GetAttrString(value, "properties");
if (item) {
+ int i;
+
if (!PyList_Check(item)) {
PyErr_Format(PyExc_ValueError, "Cant register operator class - %s.properties must be a list", idname);
Py_DECREF(item);
return NULL;
}
- int i;
for(i=0; i<PyList_Size(item); i++) {
PyObject *py_args = PyList_GET_ITEM(item, i);
PyObject *py_func_ptr, *py_kw; /* place holders */
Deleted: branches/blender2.5/blender/source/blender/yafray/intern/export_ri.cpp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list