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

src/hmtx.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "hmtx.h"
 
 #include "hhea.h"
 #include "maxp.h"
 
 // hmtx - Horizontal Metrics
-// http://www.microsoft.com/opentype/otspec/hmtx.htm
+// http://www.microsoft.com/typography/otspec/hmtx.htm
+
+#define TABLE_NAME "hmtx"
 
 namespace ots {
 
 bool ots_hmtx_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
   Buffer table(data, length);
   OpenTypeHMTX *hmtx = new OpenTypeHMTX;
   file->hmtx = hmtx;
 
   if (!file->hhea || !file->maxp) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Missing hhea or maxp tables in font, needed by hmtx");
   }
 
-  if (!ParseMetricsTable(&table, file->maxp->num_glyphs,
+  if (!ParseMetricsTable(file, &table, file->maxp->num_glyphs,
                          &file->hhea->header, &hmtx->metrics)) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Failed to parse hmtx metrics");
   }
 
   return true;
 }
 
 bool ots_hmtx_should_serialise(OpenTypeFile *file) {
   return file->hmtx != NULL;
 }
 
 bool ots_hmtx_serialise(OTSStream *out, OpenTypeFile *file) {
-  if (!SerialiseMetricsTable(out, &file->hmtx->metrics)) {
-    return OTS_FAILURE();
+  if (!SerialiseMetricsTable(file, out, &file->hmtx->metrics)) {
+    return OTS_FAILURE_MSG("Failed to serialise htmx metrics");
   }
   return true;
 }
 
 void ots_hmtx_free(OpenTypeFile *file) {
   delete file->hmtx;
 }
 
 }  // namespace ots
+
+#undef TABLE_NAME