ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-05-21 05:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

GRAPHICS: Clip Mac font glyphs to the destination surface

Browse Source 
This was probably causing instabilities in the MacVenture engine. The
engine is pretty broken at the moment, and the command window is so
small that text doesn't fit in it at all. Hopefully this will make the
remaining errors easier to debug... some day.
This commit is contained in:
Torbjörn Andersson
2021-04-04 10:23:20 +02:00
parent d48524ca9f
commit 2fb992ed4e
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/fonts/macfont.cpp
+19 -2
View File
@@ -355,14 +355,31 @@ void MacFONTFont::drawChar(Surface *dst, uint32 chr, int x, int y, uint32 color)
assert(dst != 0);
assert(dst->format.bytesPerPixel == 1 || dst->format.bytesPerPixel == 2 || dst->format.bytesPerPixel == 4);
if (x > dst->w || y > dst->h)
return;
const MacGlyph *glyph = findGlyph(chr);
if (!glyph || glyph->width == 0)
return;
for (uint16 i = 0; i < _data._fRectHeight; i++) {
if (x + glyph->bitmapWidth < 0 || y + _data._fRectHeight < 0)
return;
// Make sure we do not draw outside the surface
uint16 yStart = (y < 0) ? -y : 0;
uint16 yStop = _data._fRectHeight;
uint16 xStart = (x < 0) ? -x : 0;
uint16 xStop = glyph->bitmapWidth;
if (y + _data._fRectHeight >= dst->h)
yStop = dst->h - y;
if (x + glyph->bitmapWidth >= dst->w)
xStop = dst->w - x;
for (uint16 i = yStart; i < yStop; i++) {
byte *srcRow = _data._bitImage + i * _data._rowWords;
for (uint16 j = 0; j < glyph->bitmapWidth; j++) {
for (uint16 j = xStart; j < xStop; j++) {
uint16 bitmapOffset = glyph->bitmapOffset + j;
if (srcRow[bitmapOffset / 8] & (1 << (7 - (bitmapOffset % 8)))) {