forked from bartvdbraak/blender
More fixes for gcc warnings.
This commit is contained in:
parent
91439e7604
commit
ab662ae85c
@ -632,7 +632,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream) {
|
void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream) {
|
||||||
int cur_frame, temp, i, rewind=1;
|
int cur_frame=-1, temp, i=0, rewind=1;
|
||||||
void *buffer;
|
void *buffer;
|
||||||
|
|
||||||
/* Retrieve the record number of the desired frame in the index
|
/* Retrieve the record number of the desired frame in the index
|
||||||
|
@ -50,6 +50,7 @@
|
|||||||
#define WORDS_BIGENDIAN
|
#define WORDS_BIGENDIAN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef WORDS_BIGENDIAN
|
||||||
static void invert (int *num) {
|
static void invert (int *num) {
|
||||||
int new=0,i,j;
|
int new=0,i,j;
|
||||||
|
|
||||||
@ -79,6 +80,7 @@ static void Ichunk (AviChunk *chunk) {
|
|||||||
invert (&chunk->fcc);
|
invert (&chunk->fcc);
|
||||||
invert (&chunk->size);
|
invert (&chunk->size);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
static void Ilist (AviList *list){
|
static void Ilist (AviList *list){
|
||||||
|
@ -1949,7 +1949,7 @@ static VFontData *objfnt_to_vfontdata(objfnt *fnt)
|
|||||||
chardesc *cd;
|
chardesc *cd;
|
||||||
short *_data, *data;
|
short *_data, *data;
|
||||||
int a, i, count, stop, ready, meet;
|
int a, i, count, stop, ready, meet;
|
||||||
short first[2], last[2];
|
short first[2]={0,0}, last[2]={0,0};
|
||||||
struct Nurb *nu;
|
struct Nurb *nu;
|
||||||
struct BezTriple *bezt, *bez2;
|
struct BezTriple *bezt, *bez2;
|
||||||
float scale, dx, dy;
|
float scale, dx, dy;
|
||||||
|
@ -7576,7 +7576,9 @@ static BHead *find_previous_lib(FileData *fd, BHead *bhead)
|
|||||||
|
|
||||||
static BHead *find_bhead(FileData *fd, void *old)
|
static BHead *find_bhead(FileData *fd, void *old)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
BHead *bhead;
|
BHead *bhead;
|
||||||
|
#endif
|
||||||
struct bheadsort *bhs, bhs_s;
|
struct bheadsort *bhs, bhs_s;
|
||||||
|
|
||||||
if (!old)
|
if (!old)
|
||||||
@ -7591,9 +7593,11 @@ static BHead *find_bhead(FileData *fd, void *old)
|
|||||||
if(bhs)
|
if(bhs)
|
||||||
return bhs->bhead;
|
return bhs->bhead;
|
||||||
|
|
||||||
// for (bhead= blo_firstbhead(fd); bhead; bhead= blo_nextbhead(fd, bhead))
|
#if 0
|
||||||
// if (bhead->old==old)
|
for (bhead= blo_firstbhead(fd); bhead; bhead= blo_nextbhead(fd, bhead))
|
||||||
// return bhead;
|
if (bhead->old==old)
|
||||||
|
return bhead;
|
||||||
|
#endif
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -2162,6 +2162,7 @@ static void draw_nodespace_back_pix(ScrArea *sa, SpaceNode *snode)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
/* note: needs to be userpref or opengl profile option */
|
/* note: needs to be userpref or opengl profile option */
|
||||||
static void draw_nodespace_back_tex(ScrArea *sa, SpaceNode *snode)
|
static void draw_nodespace_back_tex(ScrArea *sa, SpaceNode *snode)
|
||||||
{
|
{
|
||||||
@ -2209,6 +2210,7 @@ static void draw_nodespace_back_tex(ScrArea *sa, SpaceNode *snode)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* nice AA filled circle */
|
/* nice AA filled circle */
|
||||||
/* this might have some more generic use */
|
/* this might have some more generic use */
|
||||||
|
@ -3086,8 +3086,8 @@ static void mouse_action (int selectmode)
|
|||||||
TimeMarker *marker, *pmarker;
|
TimeMarker *marker, *pmarker;
|
||||||
|
|
||||||
void *act_channel;
|
void *act_channel;
|
||||||
short sel, act_type;
|
short sel, act_type = 0;
|
||||||
float selx;
|
float selx = 0.0;
|
||||||
|
|
||||||
/* determine what type of data we are operating on */
|
/* determine what type of data we are operating on */
|
||||||
data = get_action_context(&datatype);
|
data = get_action_context(&datatype);
|
||||||
|
@ -488,7 +488,7 @@ static CutCurve *get_mouse_trail(int *len, char mode, char cutmode, struct GHash
|
|||||||
{
|
{
|
||||||
CutCurve *curve,*temp;
|
CutCurve *curve,*temp;
|
||||||
EditVert *snapvert;
|
EditVert *snapvert;
|
||||||
float *scr, mval[2], lastx=0, lasty=0;
|
float *scr, mval[2]={0.0,0.0}, lastx=0, lasty=0;
|
||||||
int i=0, j, blocks=1, lasti=0;
|
int i=0, j, blocks=1, lasti=0;
|
||||||
int dist, tolerance;
|
int dist, tolerance;
|
||||||
short event, val, qual, vsnap=0, ldown=0, restart=0, rubberband=0;
|
short event, val, qual, vsnap=0, ldown=0, restart=0, rubberband=0;
|
||||||
|
Loading…
Reference in New Issue
Block a user