From fde07429be6fbc82069e2a84705364c2c831004a Mon Sep 17 00:00:00 2001
From: Rod Sheeter <rsheeter@google.com>
Date: Mon, 26 Oct 2015 07:16:42 -0700
Subject: [PATCH] Be more accepting of fonts with unusual sets of tables

---
 src/normalize.cc |  9 ++++-----
 src/transform.cc | 17 +++++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/normalize.cc b/src/normalize.cc
index a16f7b6..8eb861f 100644
--- a/src/normalize.cc
+++ b/src/normalize.cc
@@ -115,21 +115,20 @@ bool MakeEditableBuffer(Font* font, int tableTag) {
 }  // namespace
 
 bool NormalizeGlyphs(Font* font) {
-  Font::Table* cff_table = font->FindTable(kCffTableTag);
   Font::Table* head_table = font->FindTable(kHeadTableTag);
   Font::Table* glyf_table = font->FindTable(kGlyfTableTag);
   Font::Table* loca_table = font->FindTable(kLocaTableTag);
   if (head_table == NULL) {
     return FONT_COMPRESSION_FAILURE();
   }
-  // CFF, no loca, no glyf is OK for CFF. If so, don't normalize.
-  if (cff_table != NULL && loca_table == NULL && glyf_table == NULL) {
+  // If you don't have glyf/loca this transform isn't very interesting
+  if (loca_table == NULL && glyf_table == NULL) {
     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();
   }
-
   // Must share neither or both loca & glyf
   if (loca_table->IsReused() != glyf_table->IsReused()) {
     return FONT_COMPRESSION_FAILURE();
diff --git a/src/transform.cc b/src/transform.cc
index 66c6e08..23cecd6 100644
--- a/src/transform.cc
+++ b/src/transform.cc
@@ -239,18 +239,23 @@ bool TransformGlyfAndLocaTables(Font* font) {
   // no transform for CFF
   const Font::Table* glyf_table = font->FindTable(kGlyfTableTag);
   const Font::Table* loca_table = font->FindTable(kLocaTableTag);
-  if (font->FindTable(kCffTableTag) != NULL
-      && glyf_table == NULL
-      && loca_table == NULL) {
+
+  // If you don't have glyf/loca this transform isn't very interesting
+  if (loca_table == NULL && glyf_table == NULL) {
     return true;
   }
-  // Must share neither or both loca/glyf
-  if (glyf_table->IsReused() != loca_table->IsReused()) {
+  // 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();
   }
-  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;
   }
+
   Font::Table* transformed_glyf = &font->tables[kGlyfTableTag ^ 0x80808080];
   Font::Table* transformed_loca = &font->tables[kLocaTableTag ^ 0x80808080];