diff options
author | Ken Hughes <khughes@pacific.edu> | 2008-02-03 04:33:35 +0300 |
---|---|---|
committer | Ken Hughes <khughes@pacific.edu> | 2008-02-03 04:33:35 +0300 |
commit | 0a27a319708a0492b0f41b5711e7a38a445e62b9 (patch) | |
tree | d94662da0c1978a71ba36a2459bc38332ca11318 /source/blender/imbuf | |
parent | 87fbe307a1986c44620f54c20187eb83ff5f5533 (diff) |
Clean-up for various gcc warnings under linux.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/filter.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 30 |
2 files changed, 15 insertions, 16 deletions
diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c index 172342c913c..6c82a1e24a7 100644 --- a/source/blender/imbuf/intern/filter.c +++ b/source/blender/imbuf/intern/filter.c @@ -256,7 +256,6 @@ void IMB_filter_extend(struct ImBuf *ibuf) float *temprect; float *row1f, *row2f, *row3f; float *fp; - int pixlen = 4; temprect= MEM_dupallocN(ibuf->rect_float); for(y=1; y<=ibuf->y; y++) { diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 0c92cc047a3..c5f5a33a5d1 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -620,7 +620,6 @@ void IMB_exr_multilayer_convert(void *handle, void *base, void IMB_exr_close(void *handle) { ExrHandle *data= (ExrHandle *)handle; - ExrChannel *echan; ExrLayer *lay; ExrPass *pass; @@ -783,28 +782,28 @@ static ExrHandle *imb_exr_begin_read_mem(InputFile *file, int width, int height) /* we can have RGB(A), XYZ(W), UVA */ if(pass->totchan==3 || pass->totchan==4) { if(pass->chan[0]->chan_id=='B' || pass->chan[1]->chan_id=='B' || pass->chan[2]->chan_id=='B') { - lookup['R']= 0; - lookup['G']= 1; - lookup['B']= 2; - lookup['A']= 3; + lookup[(unsigned int)'R']= 0; + lookup[(unsigned int)'G']= 1; + lookup[(unsigned int)'B']= 2; + lookup[(unsigned int)'A']= 3; } else if(pass->chan[0]->chan_id=='Y' || pass->chan[1]->chan_id=='Y' || pass->chan[2]->chan_id=='Y') { - lookup['X']= 0; - lookup['Y']= 1; - lookup['Z']= 2; - lookup['W']= 3; + lookup[(unsigned int)'X']= 0; + lookup[(unsigned int)'Y']= 1; + lookup[(unsigned int)'Z']= 2; + lookup[(unsigned int)'W']= 3; } else { - lookup['U']= 0; - lookup['V']= 1; - lookup['A']= 2; + lookup[(unsigned int)'U']= 0; + lookup[(unsigned int)'V']= 1; + lookup[(unsigned int)'A']= 2; } for(a=0; a<pass->totchan; a++) { echan= pass->chan[a]; - echan->rect= pass->rect + lookup[echan->chan_id]; + echan->rect= pass->rect + lookup[(unsigned int)echan->chan_id]; echan->xstride= pass->totchan; echan->ystride= width*pass->totchan; - pass->chan_id[ lookup[echan->chan_id] ]= echan->chan_id; + pass->chan_id[ (unsigned int)lookup[(unsigned int)echan->chan_id] ]= echan->chan_id; } } else { /* unknown */ @@ -836,6 +835,7 @@ typedef struct RGBA } RGBA; +#if 0 static void exr_print_filecontents(InputFile *file) { const ChannelList &channels = file->header().channels(); @@ -846,6 +846,7 @@ static void exr_print_filecontents(InputFile *file) printf("OpenEXR-load: Found channel %s of type %d\n", i.name(), channel.type); } } +#endif static int exr_has_zbuffer(InputFile *file) { @@ -853,7 +854,6 @@ static int exr_has_zbuffer(InputFile *file) for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i) { - const Channel &channel = i.channel(); if(strcmp("Z", i.name())==0) return 1; } |