diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-04-27 15:52:50 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-04-27 15:52:50 +0400 |
| commit | 7811d7209a9ebb207979269c764831ef818521b5 (patch) | |
| tree | 74504d69828bf671f179296b4ed86cff0e13cf5b /source/blender/imbuf/intern/readimage.c | |
| parent | e79db85cc18d378fc2dc6d30f0fb69d04e066f68 (diff) | |
Bunch of gcc 4.0 warning fixes.
source/creator/creator.c
changed ifdef's around fpe_handler to match when its actually used.
intern/SoundSystem/intern/SND_AudioDevice.cpp
Changed: SND_SoundObject* oldobject = oldobject = pIdObject->GetSoundObject();
to: SND_SoundObject* oldobject = pIdObject->GetSoundObject();
intern/SoundSystem/openal/SND_OpenALDevice.cpp
removed unused var.
source/blender/blenkernel/intern/mball.c
initalized a couple of vars that might have been used uninitalized.
The rest were changing types to match, most of them were something like
was short * should have been unsigned short *.
Kent
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index bbb423fa2d2..4cae5cace16 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -119,17 +119,8 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) { } } - /* let quicktime handle png's, skips error messages ;) - * but only on windows - */ -#ifdef _WIN32 - if(G.have_quicktime == FALSE) { -#else - if(1) { -#endif - ibuf = imb_loadpng((uchar *)mem, size, flags); - if (ibuf) return(ibuf); - } + ibuf = imb_loadpng((uchar *)mem, size, flags); + if (ibuf) return(ibuf); ibuf = imb_bmp_decode((uchar *)mem, size, flags); if (ibuf) return(ibuf); |