thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: Prevent crash when drawing 0-height rounded corners

Browse source 
Opening/closing the console when scroll bars were visible caused
occasional crashes. Fixes #7089.
This commit is contained in:
Ori Avtalion 2016-03-26 19:26:43 +03:00
parent a2250d74ed
commit 9b69b86f29
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
graphics/VectorRendererSpec.cpp
View file

@ -2256,6 +2256,9 @@ drawBorderRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color,
template<typename PixelType> template<typename PixelType>
void VectorRendererAA<PixelType>:: void VectorRendererAA<PixelType>::
drawInteriorRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m) { drawInteriorRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m) {
w -= 2*Base::_strokeWidth;
h -= 2*Base::_strokeWidth;
// Do not draw empty space rounded squares. // Do not draw empty space rounded squares.
if (w <= 0 || h <= 0) { if (w <= 0 || h <= 0) {
return; return;
@ -2272,8 +2275,6 @@ drawInteriorRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType colo
r -= Base::_strokeWidth; r -= Base::_strokeWidth;
x1 += Base::_strokeWidth; x1 += Base::_strokeWidth;
y1 += Base::_strokeWidth; y1 += Base::_strokeWidth;
w -= 2*Base::_strokeWidth;
h -= 2*Base::_strokeWidth;
rsq = r*r; rsq = r*r;
PixelType *ptr_tl = (PixelType *)Base::_activeSurface->getBasePtr(x1 + r, y1 + r); PixelType *ptr_tl = (PixelType *)Base::_activeSurface->getBasePtr(x1 + r, y1 + r);