diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-27 15:59:26 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-27 15:59:26 +0400 |
| commit | 590251f55a113848043c8eb43563379f614f65f3 (patch) | |
| tree | 1994ed90524d7f3bdfdb2e874ed7bd9678fe2e8a /source/blender/imbuf/intern/util.c | |
| parent | 13254cde8c7ca38af2dcec35efdb9f8f9b3bca46 (diff) | |
File format fixes
- Add check for header field in BMP decoder. This is needed to distinguish
whether file is indeed BMP image or not.
Without this check Blender could easily crash when it'll try to load
non-BMP image.
Tested with files from own HDD, but all of them has got BM header field,
more testing would be welcome.
- Made Jpeg2000 aware of J2K codec. Originally was needed to verify .j2c
files here in the studio, but having support of this codec would be
nice in general.
Currently supports only reading in this codec, writing would still
using jp2 codec.
Diffstat (limited to 'source/blender/imbuf/intern/util.c')
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 9ec22f0798e..a765ac5c3b4 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -83,6 +83,7 @@ const char *imb_ext_image[] = { #endif #ifdef WITH_OPENJPEG ".jp2", + ".j2c", #endif #ifdef WITH_HDR ".hdr", |