diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:29:50 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:31:02 +0200 |
| commit | 70dd5e7c66b1fe3f82e5b4db2406050baba15f05 (patch) | |
| tree | 3f012200ef3c934f33db1a4ef2b790fae3141860 /gfx/angle/src/image_util/loadimage_etc.cpp | |
| parent | 3b7ffb477eec078c7036c92c6a51bb5de6de4f28 (diff) | |
| parent | 8481fa25d246f1968d0a254ee3c6cdd82c60781a (diff) | |
| download | UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.gz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.lz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.xz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.zip | |
Merge branch 'ANGLE-rollback'
This resolves #624
Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.
Diffstat (limited to 'gfx/angle/src/image_util/loadimage_etc.cpp')
| -rwxr-xr-x | gfx/angle/src/image_util/loadimage_etc.cpp | 4 |
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); |