WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 14:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Compress cached fonts

Browse Source
This commit is contained in:
elasota
2020-11-28 11:45:51 -05:00
parent de06669239
commit 8a48726b2e
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PortabilityLayer/FontManager.cpp
View File

@@ -43,7 +43,7 @@ namespace PortabilityLayer
static const int kApplicationFontCacheID = 2; static const int kApplicationFontCacheID = 2;
static const int kHandwritingFontCacheID = 3; static const int kHandwritingFontCacheID = 3;
static const int kMonospaceFontCacheID = 4; static const int kMonospaceFontCacheID = 4;
static const int kFontCacheVersion = 1; static const int kFontCacheVersion = 2;
static const int kFontCacheNameSize = 64; static const int kFontCacheNameSize = 64;
struct CachedRenderedFont struct CachedRenderedFont

49
PortabilityLayer/FontRenderer.cpp
View File

@@ -5,6 +5,7 @@
#include "GpIOStream.h" #include "GpIOStream.h"
#include "IGpFontRenderedGlyph.h" #include "IGpFontRenderedGlyph.h"
#include "MacRomanConversion.h" #include "MacRomanConversion.h"
#include "MemoryManager.h"
#include "RenderedFont.h" #include "RenderedFont.h"
#include "GpRenderedFontMetrics.h" #include "GpRenderedFontMetrics.h"
#include "GpRenderedGlyphMetrics.h" #include "GpRenderedGlyphMetrics.h"
@@ -12,6 +13,7 @@
#include "PLBigEndian.h" #include "PLBigEndian.h"
#include "PLDrivers.h" #include "PLDrivers.h"
#include "PLPasStr.h" #include "PLPasStr.h"
#include "DeflateCodec.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@@ -42,7 +44,8 @@ namespace PortabilityLayer
struct CacheHeader struct CacheHeader
{ {
BEUInt32_t m_cacheVersion; BEUInt32_t m_cacheVersion;
BEUInt32_t m_glyphDataSize; BEUInt32_t m_glyphDataUncompressedSize;
BEUInt32_t m_glyphDataCompressedSize;
BEUInt32_t m_sizeSize; BEUInt32_t m_sizeSize;
BEUInt32_t m_isAA; BEUInt32_t m_isAA;
@@ -53,7 +56,7 @@ namespace PortabilityLayer
RenderedFontImpl(void *data, size_t dataSize, bool aa); RenderedFontImpl(void *data, size_t dataSize, bool aa);
~RenderedFontImpl(); ~RenderedFontImpl();
bool LoadInternal(GpIOStream *stream); bool LoadInternal(GpIOStream *stream, size_t compressedDataSize);
size_t m_dataOffsets[256]; size_t m_dataOffsets[256];
GpRenderedGlyphMetrics m_glyphMetrics[256]; GpRenderedGlyphMetrics m_glyphMetrics[256];
@@ -143,11 +146,11 @@ namespace PortabilityLayer
if (header.m_sizeSize != sizeof(size_t)) if (header.m_sizeSize != sizeof(size_t))
return nullptr; return nullptr;
RenderedFontImpl *rfont = RenderedFontImpl::Create(header.m_glyphDataSize, header.m_isAA != 0); RenderedFontImpl *rfont = RenderedFontImpl::Create(header.m_glyphDataUncompressedSize, header.m_isAA != 0);
if (!rfont) if (!rfont)
return nullptr; return nullptr;
if (!rfont->LoadInternal(stream)) if (!rfont->LoadInternal(stream, header.m_glyphDataCompressedSize))
{ {
rfont->Destroy(); rfont->Destroy();
return nullptr; return nullptr;
@@ -160,16 +163,32 @@ namespace PortabilityLayer
{ {
CacheHeader header; CacheHeader header;
header.m_cacheVersion = kRFontCacheVersion; header.m_cacheVersion = kRFontCacheVersion;
header.m_glyphDataSize = static_cast<uint32_t>(this->m_dataSize); header.m_glyphDataUncompressedSize = static_cast<uint32_t>(this->m_dataSize);
header.m_glyphDataCompressedSize = 0;
header.m_isAA = m_isAntiAliased; header.m_isAA = m_isAntiAliased;
header.m_sizeSize = sizeof(size_t); header.m_sizeSize = sizeof(size_t);
GpUFilePos_t headerPos = stream->Tell();
if (stream->Write(&header, sizeof(header)) != sizeof(header)) if (stream->Write(&header, sizeof(header)) != sizeof(header))
return false; return false;
if (stream->Write(m_data, m_dataSize) != m_dataSize) DeflateContext *deflateContext = DeflateContext::Create(stream, 9);
if (!deflateContext)
return false; return false;
GpUFilePos_t dataStartPos = stream->Tell();
if (!deflateContext->Append(m_data, m_dataSize) || !deflateContext->Flush())
{
deflateContext->Destroy();
return false;
}
deflateContext->Destroy();
GpUFilePos_t dataEndPos = stream->Tell();
if (stream->Write(m_dataOffsets, sizeof(m_dataOffsets)) != sizeof(m_dataOffsets)) if (stream->Write(m_dataOffsets, sizeof(m_dataOffsets)) != sizeof(m_dataOffsets))
return false; return false;
@@ -179,6 +198,18 @@ namespace PortabilityLayer
if (stream->Write(&m_fontMetrics, sizeof(m_fontMetrics)) != sizeof(m_fontMetrics)) if (stream->Write(&m_fontMetrics, sizeof(m_fontMetrics)) != sizeof(m_fontMetrics))
return false; return false;
GpUFilePos_t endPos = stream->Tell();
if (!stream->SeekStart(headerPos))
return false;
header.m_glyphDataCompressedSize = dataEndPos - dataStartPos;
if (stream->Write(&header, sizeof(header)) != sizeof(header))
return false;
if (!stream->SeekStart(headerPos))
return false;
return true; return true;
} }
@@ -215,9 +246,11 @@ namespace PortabilityLayer
{ {
} }
bool RenderedFontImpl::LoadInternal(GpIOStream *stream) bool RenderedFontImpl::LoadInternal(GpIOStream *stream, size_t compressedDataSize)
{ {
if (stream->Read(m_data, m_dataSize) != m_dataSize) PortabilityLayer::MemoryManager *mm = PortabilityLayer::MemoryManager::GetInstance();
if (!DeflateCodec::DecompressStream(stream, compressedDataSize, m_data, m_dataSize))
return false; return false;
if (stream->Read(m_dataOffsets, sizeof(m_dataOffsets)) != sizeof(m_dataOffsets)) if (stream->Read(m_dataOffsets, sizeof(m_dataOffsets)) != sizeof(m_dataOffsets))