summaryrefslogtreecommitdiffstats
path: root/gfx/angle/src/image_util/loadimage_etc.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-11 18:11:13 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-11 18:11:13 +0200
commit4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0 (patch)
treef000dd831240707a03b8c806db292c2a15cde3ce /gfx/angle/src/image_util/loadimage_etc.cpp
parent3b7ffb477eec078c7036c92c6a51bb5de6de4f28 (diff)
downloadUXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar.gz
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar.lz
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar.xz
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.zip
Roll back to ANGLE/2845
Diffstat (limited to 'gfx/angle/src/image_util/loadimage_etc.cpp')
-rwxr-xr-xgfx/angle/src/image_util/loadimage_etc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gfx/angle/src/image_util/loadimage_etc.cpp b/gfx/angle/src/image_util/loadimage_etc.cpp
index b0881f728..39cdef20f 100755
--- a/gfx/angle/src/image_util/loadimage_etc.cpp
+++ b/gfx/angle/src/image_util/loadimage_etc.cpp
@@ -891,10 +891,10 @@ struct ETC2Block
std::swap(dxEnd, dyEnd);
}
- for (size_t j = dyBegin; j < dyEnd; j++)
+ for (size_t j = dyBegin; j < dyEnd && (y + j) < h; j++)
{
int *row = &pixelIndices[j * 4];
- for (size_t i = dxBegin; i < dxEnd; i++)
+ for (size_t i = dxBegin; i < dxEnd && (x + i) < w; i++)
{
const size_t pixelIndex = subblockIdx * 4 + getIndex(i, j);
row[i] = static_cast<int>(pixelIndex);