libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 12:44:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update SJIS code to read SJIS.FNT version 2 data (no support for drawing ASCII and half-width katakana glyphs yet).

Browse Source 
svn-id: r44483
This commit is contained in:
Johannes Schickel 2009-09-30 13:07:12 +00:00
parent fd21bb2611
commit 1b94303b78
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
graphics/sjis.cpp
View File

@ -245,18 +245,20 @@ bool FontSjisSVM::loadData() {
}
uint32 version = data->readUint32BE();
if (version != 1) {
if (version != 2) {
delete data;
return false;
}
uint numChars = data->readUint16BE();
uint numChars16x16 = data->readUint16BE();
/*uint numChars8x16 = */data->readUint16BE();
_fontData = new uint16[numChars * 16];
assert(_fontData);
_fontData16x16 = new uint16[numChars16x16 * 16];
assert(_fontData16x16);
_fontData16x16Size = numChars16x16 * 16;
for (uint i = 0; i < _fontData16x16Size; ++i)
_fontData16x16[i] = data->readUint16BE();
for (uint i = 0; i < numChars * 16; ++i)
_fontData[i] = data->readUint16BE();
bool retValue = !data->err();
delete data;
return retValue;
@ -285,7 +287,9 @@ const uint16 *FontSjisSVM::getCharData(uint16 c) const {
if (index < 0 || index >= 0xBC || base < 0)
return 0;
return _fontData + (base * 0xBC + index) * 16;
const uint offset = (base * 0xBC + index) * 16;
assert(offset + 16 <= _fontData16x16Size);
return _fontData16x16 + offset;
}
} // end of namespace Graphics

7
graphics/sjis.h
View File

@ -168,8 +168,8 @@ private:
*/
class FontSjisSVM : public FontSJIS16x16 {
public:
FontSjisSVM() : _fontData(0) {}
~FontSjisSVM() { delete[] _fontData; }
FontSjisSVM() : _fontData16x16(0), _fontData16x16Size(0) {}
~FontSjisSVM() { delete[] _fontData16x16; }
/**
* Load the font data from "SJIS.FNT".
@ -177,7 +177,8 @@ public:
bool loadData();
private:
uint16 *_fontData;
uint16 *_fontData16x16;
uint _fontData16x16Size;
const uint16 *getCharData(uint16 c) const;
};