diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-30 04:43:46 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-30 04:43:46 +0400 |
commit | 863352dfdc1bbe30a452e1e006123fbaea3d401f (patch) | |
tree | 58611dd2a1c06f7f53ec1f2572a1b0d5575dbb69 /source | |
parent | 32e02302a7794866e736ba01fb7768e8c6640929 (diff) |
Correct issue with IMB_ispic returning bool
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/imbuf/IMB_imbuf.h | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 47f1864bd16..6e21db0e039 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -355,6 +355,7 @@ short IMB_saveiff(struct ImBuf *ibuf, const char *filepath, int flags); * \attention Defined in util.c */ bool IMB_ispic(const char *name); +int IMB_ispic_type(const char *name); /** * diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 36f83676174..052059e3a5e 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -183,7 +183,7 @@ const char *imb_ext_audio[] = { NULL }; -bool IMB_ispic(const char *name) +int IMB_ispic_type(const char *name) { /* increased from 32 to 64 because of the bitmaps header size */ #define HEADER_SIZE 64 @@ -228,11 +228,15 @@ bool IMB_ispic(const char *name) } } - return false; + return 0; #undef HEADER_SIZE } +bool IMB_ispic(const char *name) +{ + return (IMB_ispic_type(name) != 0); +} static int isavi(const char *name) { |