Updating to new OTS repo from https://github.com/khaledhosny/ots.git

src/head.cc

Index: src/head.cc
diff --git a/src/head.cc b/src/head.cc
old mode 100644
new mode 100755
index 110d6736c5fccfaaf112f37aa93d68eac0ec71c7..dcd234d24c00cbe19fabc085f59aaf96fbad2ba5
--- a/src/head.cc
+++ b/src/head.cc
@@ -7,7 +7,9 @@
 #include <cstring>
 
 // head - Font Header
-// http://www.microsoft.com/opentype/otspec/head.htm
+// http://www.microsoft.com/typography/otspec/head.htm
+
+#define TABLE_NAME "head"
 
 namespace ots {
 
@@ -18,39 +20,39 @@ bool ots_head_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
   uint32_t version = 0;
   if (!table.ReadU32(&version) ||
       !table.ReadU32(&file->head->revision)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read head header");
   }
 
   if (version >> 16 != 1) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Bad head table version of %d", version);
   }
 
   // Skip the checksum adjustment
   if (!table.Skip(4)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read checksum");
   }
 
   uint32_t magic;
   if (!table.ReadTag(&magic) ||
       std::memcmp(&magic, "\x5F\x0F\x3C\xF5", 4)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read font magic number");
   }
 
   if (!table.ReadU16(&file->head->flags)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read head flags");
   }
 
   // We allow bits 0..4, 11..13
   file->head->flags &= 0x381f;
 
   if (!table.ReadU16(&file->head->ppem)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read pixels per em");
   }
 
   // ppem must be in range
   if (file->head->ppem < 16 ||
       file->head->ppem > 16384) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Bad ppm of %d", file->head->ppem);
   }
 
   // ppem must be a power of two
@@ -58,57 +60,57 @@ bool ots_head_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
   // We don't call ots_failure() for now since lots of TrueType fonts are
   // not following this rule. Putting OTS_WARNING here is too noisy.
   if ((file->head->ppem - 1) & file->head->ppem) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("ppm not a power of two: %d", file->head->ppem);
   }
 #endif
 
   if (!table.ReadR64(&file->head->created) ||
       !table.ReadR64(&file->head->modified)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Can't read font dates");
   }
 
   if (!table.ReadS16(&file->head->xmin) ||
       !table.ReadS16(&file->head->ymin) ||
       !table.ReadS16(&file->head->xmax) ||
       !table.ReadS16(&file->head->ymax)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read font bounding box");
   }
 
   if (file->head->xmin > file->head->xmax) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Bad x dimension in the font bounding box (%d, %d)", file->head->xmin, file->head->xmax);
   }
   if (file->head->ymin > file->head->ymax) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Bad y dimension in the font bounding box (%d, %d)", file->head->ymin, file->head->ymax);
   }
 
   if (!table.ReadU16(&file->head->mac_style)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read font style");
   }
 
   // We allow bits 0..6
   file->head->mac_style &= 0x7f;
 
   if (!table.ReadU16(&file->head->min_ppem)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read font minimum ppm");
   }
 
   // We don't care about the font direction hint
   if (!table.Skip(2)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to skip font direction hint");
   }
 
   if (!table.ReadS16(&file->head->index_to_loc_format)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read index to loc format");
   }
   if (file->head->index_to_loc_format < 0 ||
       file->head->index_to_loc_format > 1) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Bad index to loc format %d", file->head->index_to_loc_format);
   }
 
   int16_t glyph_data_format;
   if (!table.ReadS16(&glyph_data_format) ||
       glyph_data_format) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to read glyph data format");
   }
 
   return true;
@@ -136,7 +138,7 @@ bool ots_head_serialise(OTSStream *out, OpenTypeFile *file) {
       !out->WriteS16(2) ||
       !out->WriteS16(file->head->index_to_loc_format) ||
       !out->WriteS16(0)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to write head table");
   }
 
   return true;
@@ -147,3 +149,5 @@ void ots_head_free(OpenTypeFile *file) {
 }
 
 }  // namespace
+
+#undef TABLE_NAME