Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-08-28 12:57:31 +0300
committerJeroen Bakker <jeroen@blender.org>2021-08-30 12:34:37 +0300
commit5f156291cdcccba300866e89ef35837093ba52f9 (patch)
tree82b1c0311d7a694bada718ea09c48315fb9ecc5f
parent06317ce957212c8aff1415bba57102acd2c923c9 (diff)
Fix error scaling thumbnails to zero dimensions
Follow up to fix for T89868.
-rw-r--r--source/blender/imbuf/intern/thumbs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 17b619d451c..f312ec65bb3 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -435,8 +435,9 @@ static ImBuf *thumb_create_ex(const char *file_path,
scaledy = (float)tsize;
scaledx = ((float)img->x / (float)img->y) * tsize;
}
- ex = (short)scaledx;
- ey = (short)scaledy;
+ /* Scaling down must never assign zero width/height, see: T89868. */
+ ex = MAX2(1, (short)scaledx);
+ ey = MAX2(1, (short)scaledy);
/* save some time by only scaling byte buf */
if (img->rect_float) {