archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use IMB_FTYPE_NONE instead of 0 for imbuf format comparison

Browse Source 
Image format code checked the file type against an enum except for
zero which is used when the format can't be detected.

Also add doc-strings to some of the image file type callbacks.
This commit is contained in:
Campbell Barton
2020-11-13 20:25:21 +11:00
parent 4a3b26dd5e
commit a8f9a24939
7 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/imbuf/intern/util.c
View File

@@ -159,7 +159,7 @@ int IMB_ispic_type_from_memory(const unsigned char *buf, const size_t buf_size)
}
}
return 0;
return IMB_FTYPE_NONE;
}
int IMB_ispic_type(const char *filepath)
@@ -167,7 +167,7 @@ int IMB_ispic_type(const char *filepath)
unsigned char buf[HEADER_SIZE];
const ssize_t buf_size = imb_ispic_read_header_from_filepath(filepath, buf);
if (buf_size <= 0) {
return 0;
return IMB_FTYPE_NONE;
}
return IMB_ispic_type_from_memory(buf, (size_t)buf_size);
}
@@ -196,7 +196,7 @@ bool IMB_ispic_type_matches(const char *filepath, int filetype)
bool IMB_ispic(const char *filepath)
{
return (IMB_ispic_type(filepath) != 0);
return (IMB_ispic_type(filepath) != IMB_FTYPE_NONE);
}
static bool isavi(const char *filepath)