diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
| commit | 2783783575a9b712eb318b450dc5e6bb17d7f7c5 (patch) | |
| tree | fdec4e4cf274e2a916e22d73d11afbce5bb669c0 /indra/llimage/llimagedxt.cpp | |
| parent | 6d256d679e9cea63753266420ed79efa8b70dee2 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merge to 5.2.0
Diffstat (limited to 'indra/llimage/llimagedxt.cpp')
| -rw-r--r-- | indra/llimage/llimagedxt.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp index 3a7319d765..36317a5ba8 100644 --- a/indra/llimage/llimagedxt.cpp +++ b/indra/llimage/llimagedxt.cpp @@ -289,7 +289,11 @@ bool LLImageDXT::decode(LLImageRaw* raw_image, F32 time) return false; } - raw_image->resize(width, height, ncomponents); + if (!raw_image->resize(width, height, ncomponents)) + { + setLastError("llImageDXT failed to resize image!"); + return false; + } memcpy(raw_image->getData(), data, image_size); /* Flawfinder: ignore */ return true; |