diff options
| author | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
| commit | 790025c01ed76c06e69e6054f1a718ca57771e28 (patch) | |
| tree | 7461d495f199142172b0efa34e5ad75ea65def6a /source/blender/imbuf | |
| parent | 99efebd2dd24a8e0827cf0f13bc40c2844946676 (diff) | |
| parent | 8d671f6f6550605ac738f7a9727375a024614837 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# intern/cycles/blender/blender_mesh.cpp
# source/blender/editors/screen/screen_ops.c
# source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/dpxlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index b6e8b43b009..d29518fc5bc 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -193,7 +193,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 = sizeof(header.imageHeader.element) / sizeof(header.imageHeader.element[0]); if (dpx->numElements == 0 || dpx->numElements >= max_elements) { if (verbose) printf("DPX: Wrong number of elements: %d\n", dpx->numElements); logImageClose(dpx); |