jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some tests.

Browse source
This commit is contained in:
James Grogan 2022-12-01 10:52:48 +00:00
parent b17ba8b3a7
commit c102ebb6da
64 changed files with 615 additions and 541 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/fonts/FontReader.cpp
View file

@ -19,19 +19,19 @@ void FontReader::setPath(const std::string& path)
bool FontReader::readOffsetSubtable()
{
mOffsetSubtable.scaler_type = *BinaryStream::getNextDWord(mFile->GetInHandle());
mOffsetSubtable.scaler_type = *BinaryStream::getNextDWord(mFile->getInHandle());
mCurrentOffset += 4;
mOffsetSubtable.num_tables = *BinaryStream::getNextWord(mFile->GetInHandle());
mOffsetSubtable.num_tables = *BinaryStream::getNextWord(mFile->getInHandle());
mCurrentOffset += 2;
mOffsetSubtable.search_range = *BinaryStream::getNextWord(mFile->GetInHandle());
mOffsetSubtable.search_range = *BinaryStream::getNextWord(mFile->getInHandle());
mCurrentOffset += 2;
mOffsetSubtable.entry_selector = *BinaryStream::getNextWord(mFile->GetInHandle());
mOffsetSubtable.entry_selector = *BinaryStream::getNextWord(mFile->getInHandle());
mCurrentOffset += 2;
mOffsetSubtable.range_shift = *BinaryStream::getNextWord(mFile->GetInHandle());
mOffsetSubtable.range_shift = *BinaryStream::getNextWord(mFile->getInHandle());
mCurrentOffset += 2;
return true;
@ -60,16 +60,16 @@ void FontReader::readTableDirectory()
for (unsigned idx=0; idx<mOffsetSubtable.num_tables; idx++)
{
Table table;
BinaryStream::getNextString(mFile->GetInHandle(), table.name, 4);
BinaryStream::getNextString(mFile->getInHandle(), table.name, 4);
mCurrentOffset += 4;
table.checksum = *BinaryStream::getNextDWord(mFile->GetInHandle());
table.checksum = *BinaryStream::getNextDWord(mFile->getInHandle());
mCurrentOffset += 4;
table.offset = *BinaryStream::getNextDWord(mFile->GetInHandle());
table.offset = *BinaryStream::getNextDWord(mFile->getInHandle());
mCurrentOffset += 4;
table.length = *BinaryStream::getNextDWord(mFile->GetInHandle());
table.length = *BinaryStream::getNextDWord(mFile->getInHandle());
mCurrentOffset += 4;
logTable(table);
@ -117,29 +117,29 @@ void FontReader::readHeadTable()
TrueTypeFont::HeadTable table;
table.version = *BinaryStream::getNextDWord(mFile->GetInHandle());
table.fontRevision = *BinaryStream::getNextDWord(mFile->GetInHandle());
table.checksumAdjustment = *BinaryStream::getNextDWord(mFile->GetInHandle());
table.magicNumber = *BinaryStream::getNextDWord(mFile->GetInHandle());
table.version = *BinaryStream::getNextDWord(mFile->getInHandle());
table.fontRevision = *BinaryStream::getNextDWord(mFile->getInHandle());
table.checksumAdjustment = *BinaryStream::getNextDWord(mFile->getInHandle());
table.magicNumber = *BinaryStream::getNextDWord(mFile->getInHandle());
mCurrentOffset += 16;
table.flags = *BinaryStream::getNextWord(mFile->GetInHandle());
table.unitsPerEm = *BinaryStream::getNextWord(mFile->GetInHandle());
table.flags = *BinaryStream::getNextWord(mFile->getInHandle());
table.unitsPerEm = *BinaryStream::getNextWord(mFile->getInHandle());
mCurrentOffset += 4;
table.created = *BinaryStream::getNextQWord(mFile->GetInHandle());
table.modified = *BinaryStream::getNextQWord(mFile->GetInHandle());
table.created = *BinaryStream::getNextQWord(mFile->getInHandle());
table.modified = *BinaryStream::getNextQWord(mFile->getInHandle());
mCurrentOffset += 16;
table.xMin = *BinaryStream::getNextWord(mFile->GetInHandle());
table.yMin = *BinaryStream::getNextWord(mFile->GetInHandle());
table.xMax = *BinaryStream::getNextWord(mFile->GetInHandle());
table.yMax = *BinaryStream::getNextWord(mFile->GetInHandle());
table.macStyle = *BinaryStream::getNextWord(mFile->GetInHandle());
table.lowestRecPPEM = *BinaryStream::getNextWord(mFile->GetInHandle());
table.fontDirectionHint = *BinaryStream::getNextWord(mFile->GetInHandle());
table.indexToLocFormat = *BinaryStream::getNextWord(mFile->GetInHandle());
table.glyphDataFormat = *BinaryStream::getNextWord(mFile->GetInHandle());
table.xMin = *BinaryStream::getNextWord(mFile->getInHandle());
table.yMin = *BinaryStream::getNextWord(mFile->getInHandle());
table.xMax = *BinaryStream::getNextWord(mFile->getInHandle());
table.yMax = *BinaryStream::getNextWord(mFile->getInHandle());
table.macStyle = *BinaryStream::getNextWord(mFile->getInHandle());
table.lowestRecPPEM = *BinaryStream::getNextWord(mFile->getInHandle());
table.fontDirectionHint = *BinaryStream::getNextWord(mFile->getInHandle());
table.indexToLocFormat = *BinaryStream::getNextWord(mFile->getInHandle());
table.glyphDataFormat = *BinaryStream::getNextWord(mFile->getInHandle());
mCurrentOffset += 18;
@ -154,7 +154,7 @@ std::unique_ptr<IFont> FontReader::read()
mWorkingFont = std::make_unique<TrueTypeFont>();
mFile = std::make_unique<File>(mPath);
mFile->Open(true);
mFile->open(File::AccessMode::Read);
readOffsetSubtable();
//std::cout << "Current offset: " << mCurrentOffset << std::endl;
@ -171,7 +171,7 @@ std::unique_ptr<IFont> FontReader::read()
break;
}
mFile->Close();
mFile->close();