diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-08-08 07:06:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-08 07:08:37 +0300 |
commit | a1d57e3f05f1602a07698e19f97f861d41f14775 (patch) | |
tree | 09d993cceed4d37c6d6a89ecd8aa764424aa0966 /source/blender/imbuf/intern | |
parent | 171e77c3c25a1224fc5f7db40ec6f8879f8dbbb0 (diff) |
Cleanup: replace sizeof division with ARRAY_SIZE macro
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/cineon/dpxlib.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/filetype.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 8acfc23439f..73003265d8d 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -207,7 +207,7 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf dpx->srcFormat = format_DPX; dpx->numElements = swap_ushort(header.imageHeader.elements_per_image, dpx->isMSB); - size_t max_elements = sizeof(header.imageHeader.element) / sizeof(header.imageHeader.element[0]); + size_t max_elements = ARRAY_SIZE(header.imageHeader.element); if (dpx->numElements == 0 || dpx->numElements >= max_elements) { if (verbose) { printf("DPX: Wrong number of elements: %d\n", dpx->numElements); diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c index 29430036182..5aa588da36d 100644 --- a/source/blender/imbuf/intern/filetype.c +++ b/source/blender/imbuf/intern/filetype.c @@ -224,8 +224,7 @@ const ImFileType IMB_FILE_TYPES[] = { {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0}, }; -const ImFileType *IMB_FILE_TYPES_LAST = - &IMB_FILE_TYPES[sizeof(IMB_FILE_TYPES) / sizeof(ImFileType) - 1]; +const ImFileType *IMB_FILE_TYPES_LAST = &IMB_FILE_TYPES[ARRAY_SIZE(IMB_FILE_TYPES) - 1]; void imb_filetypes_init(void) { |