diff options
| author | Kent Mein <mein@cs.umn.edu> | 2006-02-28 21:30:16 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2006-02-28 21:30:16 +0300 |
| commit | 59aced7a509e40654eec4e321f60ce20f173450d (patch) | |
| tree | 1ba917b7e0a5e61c85f32df5450ba7b7528d6a9d /source/blender/imbuf/intern/readimage.c | |
| parent | 21df108cb92355c60f6b4852ac7a558b5ffa778e (diff) | |
Fix for bug #3886
Basically the check for a type of jpeg was messed up.
I added a imb_is_a_jpeg function since I was working on that bit and
it makes it a little more similar to the other filetypes.
I also changed a switch statement that had the same loop for all
cases, just moved the loop outside of the switch statement.
Kent
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index 42b23dfb6e9..23fe3f0a6d2 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -96,7 +96,7 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) { } else { if ((GS(mem) == IMAGIC) || (GSS(mem) == IMAGIC)){ return (imb_loadiris((uchar *) mem, flags)); - } else if ((BIG_LONG(mem[0]) & 0xfffffff0) == 0xffd8ffe0) { + } else if (imb_is_a_jpeg((uchar *)mem)) { return (imb_ibJpegImageFromMemory((uchar *)mem, size, flags)); } |