2.50: some warning fixes.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 17 Mar 2009 22:27:15 +0000 (22:27 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 17 Mar 2009 22:27:15 +0000 (22:27 +0000)
source/blender/blenkernel/BKE_ipo.h
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenlib/intern/storage.c
source/blender/editors/screen/area.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_header.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_text/text_ops.c
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/blender/python/intern/bpy_opwrapper.c
source/blender/yafray/intern/export_ri.cpp [deleted file]

index a3f451438bd71bea5fa4ba46353e80c047ec608b..e12170b73c95f7c703c3b8954caa7a342f68925b 100644 (file)
@@ -38,7 +38,7 @@ extern "C" {
 struct Main;
 struct Ipo;
 
-void do_versions_ipo_to_animato(struct Main *main);
+void do_versions_ipos_to_animato(struct Main *main);
 
 /* --------------------- xxx stuff ------------------------ */
 
index 9ea115903b0d5af9b075a5e5f6ca9c85ae7c48e8..2ee95ed928efcbd37c4551ea6e81441788e02e80 100644 (file)
@@ -1038,8 +1038,8 @@ static void do_gammacross_effect(Sequence * seq,int cfra,
        } 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 @@ static void do_transform(Sequence * seq,float facf0, int x, int y,
        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;
index d3570808d6df378e7983191f332e0929a64ef583..9204ab18bfad128153fafad4fc8bc635aee61c12 100644 (file)
@@ -334,7 +334,6 @@ void BLI_adddirstrings()
        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 @@ void BLI_adddirstrings()
                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));
index 6dde367ff1bd8e22842d0b8b4a64cbc008e33560..5c481652db102d672d8246953ff1bcd7d676bb46 100644 (file)
@@ -702,9 +702,6 @@ void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space)
 
 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);
index 971a0b3ad0688d845772dd52802065667d122628..c65c486d4bb9d00ce7a7e664c9dbb6dfadd88613 100644 (file)
@@ -550,7 +550,6 @@ void file_draw_list(const bContext *C, ARegion *ar)
 
 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);
index b9d6c7f7c101cf48a7b94d647d75d89e6e39fd43..54dd7ff15baaa2c8e418b43527be98b351b0df93 100644 (file)
 
 /* ************************ 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);
index e38aed0757703b69c283e310688309e8c9a34fae..1ba845669405847a73f62ac6888356ff9bc460cb 100644 (file)
@@ -274,7 +274,6 @@ static int compare_extension(const void *a1, const void *a2) {
 
 void filelist_filter(FileList* filelist)
 {
-       char dir[FILE_MAX], group[GROUP_MAX];
        int num_filtered = 0;
        int i, j;
        
@@ -667,7 +666,6 @@ int filelist_column_len(struct FileList* filelist, FileListColumns column)
 void filelist_readdir(struct FileList* filelist)
 {
        char wdir[FILE_MAX];
-       int finished = 0;
        int i;
 
        if (!filelist) return;
index 239e819c6deef5144e6ba51c0989bd6c0be063c7..f98c5bf17dd6c96a3469bcf348174e43f36b0fb3 100644 (file)
@@ -78,11 +78,6 @@ static int text_new_poll(bContext *C)
        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);
index 3e618a483e352ca8b8ebf981b5de9cd84035d941..e723609f3ae5c1c81445048000b658552c32a8cb 100644 (file)
@@ -861,7 +861,6 @@ static const char *exr_rgba_channelname(InputFile *file, const char *chan)
        
        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) {
index 727dee015316a27d037c33e1b74bab1b5b42156b..328864ac8b80853d5c66db687c0eca508dc6a55f 100644 (file)
@@ -299,6 +299,7 @@ void PYTHON_OT_wrapper(wmOperatorType *ot, void *userdata)
 {
        PyOperatorType *pyot = (PyOperatorType *)userdata;
        PyObject *py_class = pyot->py_class;
+       PyObject *props, *item;
 
        /* identifiers */
        ot->name= pyot->name;
@@ -316,7 +317,6 @@ void PYTHON_OT_wrapper(wmOperatorType *ot, void *userdata)
        ot->pyop_data= userdata;
        
        // TODO - set properties
-       PyObject *props, *item;
        
        
        if ((props=PyObject_GetAttrString(py_class, "properties"))) {           
@@ -325,9 +325,9 @@ void PYTHON_OT_wrapper(wmOperatorType *ot, void *userdata)
                int i;
                
                for(i=0; i<PyList_Size(props); i++) {
-                       item = PyList_GET_ITEM(props, i);
-                       
                        PyObject *py_func_ptr, *py_kw, *py_srna_cobject, *py_ret;
+
+                       item = PyList_GET_ITEM(props, i);
                        
                        if (PyArg_ParseTuple(item, "O!O!", &PyCObject_Type, &py_func_ptr, &PyDict_Type, &py_kw)) {
                                
@@ -372,8 +372,10 @@ PyObject *PYOP_wrap_add(PyObject *self, PyObject *args)
        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 @@ PyObject *PYOP_wrap_add(PyObject *self, PyObject *args)
        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 @@ PyObject *PYOP_wrap_add(PyObject *self, PyObject *args)
        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 @@ PyObject *PYOP_wrap_add(PyObject *self, PyObject *args)
                        /* 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 @@ PyObject *PYOP_wrap_add(PyObject *self, PyObject *args)
        /* 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 */
diff --git a/source/blender/yafray/intern/export_ri.cpp b/source/blender/yafray/intern/export_ri.cpp
deleted file mode 100644 (file)
index e69de29..0000000