diff options
| author | Narek Mailian | 2013-08-01 17:30:11 +0200 |
|---|---|---|
| committer | Narek Mailian | 2013-08-08 08:27:11 +0200 |
| commit | 1d40dca7a0446aad81380c7c207461b18b79428d (patch) | |
| tree | 3c2402831b32c29e79fb14e14f038af14af055bd | |
| parent | 0f59009e6e57ad58c4bc4f925c0c75361c304544 (diff) | |
| download | scummvm-rg350-1d40dca7a0446aad81380c7c207461b18b79428d.tar.gz scummvm-rg350-1d40dca7a0446aad81380c7c207461b18b79428d.tar.bz2 scummvm-rg350-1d40dca7a0446aad81380c7c207461b18b79428d.zip | |
GRAPHICS: Add error-checking in blendPixelPtr for invalid BPPs
| -rw-r--r-- | graphics/VectorRendererSpec.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp index 1fee861539..e594be98df 100644 --- a/graphics/VectorRendererSpec.cpp +++ b/graphics/VectorRendererSpec.cpp @@ -566,7 +566,7 @@ blendPixelPtr(PixelType *ptr, PixelType color, uint8 alpha) { | ((dG << _format.gShift) & _greenMask) | ((dB << _format.bShift) & _blueMask) | (*ptr & _alphaMask); - } else { + } else if (sizeof(PixelType) == 2) { int idst = *ptr; int isrc = color; @@ -581,6 +581,8 @@ blendPixelPtr(PixelType *ptr, PixelType color, uint8 alpha) { ((int)(((int)(isrc & _blueMask) - (int)(idst & _blueMask)) * alpha) >> 8))) | (idst & _alphaMask)); + } else { + error("Unsupported BPP format: %d", sizeof(PixelType)); } } |