diff options
Diffstat (limited to 'source/blender/imbuf/intern/util.c')
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index ffa989a29b4..2870ff56c0a 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -106,8 +106,7 @@ const char *imb_ext_audio[] = { /* Increased from 32 to 64 because of the bitmaps header size. */ #define HEADER_SIZE 64 -static ssize_t imb_ispic_read_header_from_filepath(const char *filepath, - unsigned char buf[HEADER_SIZE]) +static ssize_t imb_ispic_read_header_from_filepath(const char *filepath, uchar buf[HEADER_SIZE]) { BLI_stat_t st; int fp; @@ -135,7 +134,7 @@ static ssize_t imb_ispic_read_header_from_filepath(const char *filepath, return size; } -int IMB_ispic_type_from_memory(const unsigned char *buf, const size_t buf_size) +int IMB_ispic_type_from_memory(const uchar *buf, const size_t buf_size) { for (const ImFileType *type = IMB_FILE_TYPES; type < IMB_FILE_TYPES_LAST; type++) { if (type->is_a != NULL) { @@ -150,7 +149,7 @@ int IMB_ispic_type_from_memory(const unsigned char *buf, const size_t buf_size) int IMB_ispic_type(const char *filepath) { - unsigned char buf[HEADER_SIZE]; + uchar buf[HEADER_SIZE]; const ssize_t buf_size = imb_ispic_read_header_from_filepath(filepath, buf); if (buf_size <= 0) { return IMB_FTYPE_NONE; @@ -160,7 +159,7 @@ int IMB_ispic_type(const char *filepath) bool IMB_ispic_type_matches(const char *filepath, int filetype) { - unsigned char buf[HEADER_SIZE]; + uchar buf[HEADER_SIZE]; const ssize_t buf_size = imb_ispic_read_header_from_filepath(filepath, buf); if (buf_size <= 0) { return false; @@ -251,7 +250,7 @@ const char *IMB_ffmpeg_last_error(void) static int isffmpeg(const char *filepath) { AVFormatContext *pFormatCtx = NULL; - unsigned int i; + uint i; int videoStream; const AVCodec *pCodec; |