diff options
author | Ken Hughes <khughes@pacific.edu> | 2008-02-03 21:50:03 +0300 |
---|---|---|
committer | Ken Hughes <khughes@pacific.edu> | 2008-02-03 21:50:03 +0300 |
commit | ab662ae85c4c9d3a2e28f1c26926934708f57482 (patch) | |
tree | c8cbaefc695d3dcbd928b212f3c971f1b7585f72 /source | |
parent | 91439e7604ccb3faaaa55b80a9fb7e185842753e (diff) |
More fixes for gcc warnings.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/avi/intern/avi.c | 2 | ||||
-rw-r--r-- | source/blender/avi/intern/endian.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/psfont.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 | ||||
-rw-r--r-- | source/blender/src/drawnode.c | 2 | ||||
-rw-r--r-- | source/blender/src/editaction.c | 4 | ||||
-rw-r--r-- | source/blender/src/editmesh_loop.c | 2 |
7 files changed, 16 insertions, 8 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index 7e3d7ac6133..da51c00c196 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -632,7 +632,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) { } 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; /* Retrieve the record number of the desired frame in the index diff --git a/source/blender/avi/intern/endian.c b/source/blender/avi/intern/endian.c index 152530dac0d..2ebbd5d4975 100644 --- a/source/blender/avi/intern/endian.c +++ b/source/blender/avi/intern/endian.c @@ -50,6 +50,7 @@ #define WORDS_BIGENDIAN #endif +#ifdef WORDS_BIGENDIAN static void invert (int *num) { int new=0,i,j; @@ -79,6 +80,7 @@ static void Ichunk (AviChunk *chunk) { invert (&chunk->fcc); invert (&chunk->size); } +#endif #ifdef WORDS_BIGENDIAN static void Ilist (AviList *list){ diff --git a/source/blender/blenlib/intern/psfont.c b/source/blender/blenlib/intern/psfont.c index 941bf4204a8..1fcb6653dc9 100644 --- a/source/blender/blenlib/intern/psfont.c +++ b/source/blender/blenlib/intern/psfont.c @@ -1949,7 +1949,7 @@ static VFontData *objfnt_to_vfontdata(objfnt *fnt) chardesc *cd; short *_data, *data; 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 BezTriple *bezt, *bez2; float scale, dx, dy; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index a05683dfd10..6b07821a03c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7576,7 +7576,9 @@ static BHead *find_previous_lib(FileData *fd, BHead *bhead) static BHead *find_bhead(FileData *fd, void *old) { +#if 0 BHead *bhead; +#endif struct bheadsort *bhs, bhs_s; if (!old) @@ -7591,9 +7593,11 @@ static BHead *find_bhead(FileData *fd, void *old) if(bhs) return bhs->bhead; -// for (bhead= blo_firstbhead(fd); bhead; bhead= blo_nextbhead(fd, bhead)) -// if (bhead->old==old) -// return bhead; +#if 0 + for (bhead= blo_firstbhead(fd); bhead; bhead= blo_nextbhead(fd, bhead)) + if (bhead->old==old) + return bhead; +#endif return NULL; } diff --git a/source/blender/src/drawnode.c b/source/blender/src/drawnode.c index 3f2326a9a93..9d72d4578e8 100644 --- a/source/blender/src/drawnode.c +++ b/source/blender/src/drawnode.c @@ -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 */ 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 */ /* this might have some more generic use */ diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index 0d48db79b8f..38be3ccde91 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -3086,8 +3086,8 @@ static void mouse_action (int selectmode) TimeMarker *marker, *pmarker; void *act_channel; - short sel, act_type; - float selx; + short sel, act_type = 0; + float selx = 0.0; /* determine what type of data we are operating on */ data = get_action_context(&datatype); diff --git a/source/blender/src/editmesh_loop.c b/source/blender/src/editmesh_loop.c index c44a0607464..b99710f782f 100644 --- a/source/blender/src/editmesh_loop.c +++ b/source/blender/src/editmesh_loop.c @@ -488,7 +488,7 @@ static CutCurve *get_mouse_trail(int *len, char mode, char cutmode, struct GHash { CutCurve *curve,*temp; 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 dist, tolerance; short event, val, qual, vsnap=0, ldown=0, restart=0, rubberband=0; |