zumun/woff2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Be more accepting of fonts with unusual sets of tables

Browse Source
This commit is contained in:
Rod Sheeter
2015-10-26 07:16:42 -07:00
parent eeec219f20
commit fde07429be
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/normalize.cc
+4 -5
View File
@@ -115,21 +115,20 @@ bool MakeEditableBuffer(Font* font, int tableTag) {
} // namespace } // namespace
bool NormalizeGlyphs(Font* font) { bool NormalizeGlyphs(Font* font) {
Font::Table* cff_table = font->FindTable(kCffTableTag);
Font::Table* head_table = font->FindTable(kHeadTableTag); Font::Table* head_table = font->FindTable(kHeadTableTag);
Font::Table* glyf_table = font->FindTable(kGlyfTableTag); Font::Table* glyf_table = font->FindTable(kGlyfTableTag);
Font::Table* loca_table = font->FindTable(kLocaTableTag); Font::Table* loca_table = font->FindTable(kLocaTableTag);
if (head_table == NULL) { if (head_table == NULL) {
return FONT_COMPRESSION_FAILURE(); return FONT_COMPRESSION_FAILURE();
} }
// CFF, no loca, no glyf is OK for CFF. If so, don't normalize. // If you don't have glyf/loca this transform isn't very interesting
if (cff_table != NULL && loca_table == NULL && glyf_table == NULL) { if (loca_table == NULL && glyf_table == NULL) {
return true; return true;
} }
if (loca_table == NULL || glyf_table == NULL) { // It would be best if you didn't have just one of glyf/loca
if ((glyf_table == NULL) != (loca_table == NULL)) {
return FONT_COMPRESSION_FAILURE(); return FONT_COMPRESSION_FAILURE();
} }
// Must share neither or both loca & glyf // Must share neither or both loca & glyf
if (loca_table->IsReused() != glyf_table->IsReused()) { if (loca_table->IsReused() != glyf_table->IsReused()) {
return FONT_COMPRESSION_FAILURE(); return FONT_COMPRESSION_FAILURE();
src/transform.cc
+11 -6
View File
@@ -239,18 +239,23 @@ bool TransformGlyfAndLocaTables(Font* font) {
// no transform for CFF // no transform for CFF
const Font::Table* glyf_table = font->FindTable(kGlyfTableTag); const Font::Table* glyf_table = font->FindTable(kGlyfTableTag);
const Font::Table* loca_table = font->FindTable(kLocaTableTag); const Font::Table* loca_table = font->FindTable(kLocaTableTag);
if (font->FindTable(kCffTableTag) != NULL
&& glyf_table == NULL // If you don't have glyf/loca this transform isn't very interesting
&& loca_table == NULL) { if (loca_table == NULL && glyf_table == NULL) {
return true; return true;
} }
// Must share neither or both loca/glyf // It would be best if you didn't have just one of glyf/loca
if (glyf_table->IsReused() != loca_table->IsReused()) { if ((glyf_table == NULL) != (loca_table == NULL)) {
return FONT_COMPRESSION_FAILURE(); return FONT_COMPRESSION_FAILURE();
} }
if (glyf_table->IsReused()) { // Must share neither or both loca & glyf
if (loca_table->IsReused() != glyf_table->IsReused()) {
return FONT_COMPRESSION_FAILURE();
}
if (loca_table->IsReused()) {
return true; return true;
} }
Font::Table* transformed_glyf = &font->tables[kGlyfTableTag ^ 0x80808080]; Font::Table* transformed_glyf = &font->tables[kGlyfTableTag ^ 0x80808080];
Font::Table* transformed_loca = &font->tables[kLocaTableTag ^ 0x80808080]; Font::Table* transformed_loca = &font->tables[kLocaTableTag ^ 0x80808080];