ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

GRAPHICS: Slight cleanup in BDF code.

Browse Source
This commit is contained in:
Johannes Schickel
2012-01-06 15:52:55 +01:00
parent abbc87e180
commit 243de5950f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/fonts/bdf.cpp
+7 -4
View File
@@ -482,6 +482,9 @@ BdfFont *BdfFont::loadFont(Common::SeekableReadStream &stream) {
return new BdfFont(font, DisposeAfterUse::YES);
}
#define BDF_FONTCACHE_TAG MKTAG('S', 'V', 'F', 'C')
#define BDF_FONTCACHE_VERSION 1
bool BdfFont::cacheFontData(const BdfFont &font, const Common::String &filename) {
Common::DumpFile cacheFile;
if (!cacheFile.open(filename)) {
@@ -491,8 +494,8 @@ bool BdfFont::cacheFontData(const BdfFont &font, const Common::String &filename)
const BdfFontData &data = font._data;
cacheFile.writeUint32BE(MKTAG('S', 'V', 'F', 'C'));
cacheFile.writeUint32BE(1);
cacheFile.writeUint32BE(BDF_FONTCACHE_TAG);
cacheFile.writeUint32BE(BDF_FONTCACHE_VERSION);
cacheFile.writeUint16BE(data.maxAdvance);
cacheFile.writeByte(data.height);
cacheFile.writeByte(data.defaultBox.width);
@@ -541,11 +544,11 @@ bool BdfFont::cacheFontData(const BdfFont &font, const Common::String &filename)
BdfFont *BdfFont::loadFromCache(Common::SeekableReadStream &stream) {
const uint32 magic = stream.readUint32BE();
if (magic != MKTAG('S', 'V', 'F', 'C'))
if (magic != BDF_FONTCACHE_TAG)
return 0;
const uint32 version = stream.readUint32BE();
if (version != 1)
if (version != BDF_FONTCACHE_VERSION)
return 0;
BdfFontData data;