diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-22 10:40:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-22 10:40:17 +0400 |
commit | 551096d6fd414510c4d726d0dae2f9703cb440d9 (patch) | |
tree | 8f237e5942954d9da1bea04d69792d751dc52b77 /source/blender/imbuf | |
parent | 1b523b54e680d1b0bc8c7c978f8f5cf2e5b1a64e (diff) |
BLI_open: check returned value for `-1` instead of `< 0`
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/readimage.c | 9 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index 6988687e4ed..1124d06f851 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -215,7 +215,8 @@ ImBuf *IMB_loadiffname(const char *filepath, int flags, char colorspace[IM_MAX_S imb_cache_filename(filepath_tx, filepath, flags); file = BLI_open(filepath_tx, O_BINARY | O_RDONLY, 0); - if (file < 0) return NULL; + if (file == -1) + return NULL; ibuf = IMB_loadifffile(file, filepath, flags, colorspace, filepath_tx); @@ -242,7 +243,8 @@ ImBuf *IMB_testiffname(const char *filepath, int flags) imb_cache_filename(filepath_tx, filepath, flags); file = BLI_open(filepath_tx, O_BINARY | O_RDONLY, 0); - if (file < 0) return NULL; + if (file == -1) + return NULL; ibuf = IMB_loadifffile(file, filepath, flags | IB_test | IB_multilayer, colorspace, filepath_tx); @@ -285,7 +287,8 @@ void imb_loadtile(ImBuf *ibuf, int tx, int ty, unsigned int *rect) int file; file = BLI_open(ibuf->cachename, O_BINARY | O_RDONLY, 0); - if (file < 0) return; + if (file == -1) + return; imb_loadtilefile(ibuf, file, tx, ty, rect); diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index a91990774fc..36f83676174 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -200,7 +200,7 @@ bool IMB_ispic(const char *name) if (((st.st_mode) & S_IFMT) != S_IFREG) return false; - if ((fp = BLI_open(name, O_BINARY | O_RDONLY, 0)) < 0) + if ((fp = BLI_open(name, O_BINARY | O_RDONLY, 0)) == -1) return false; memset(buf, 0, sizeof(buf)); |