Update OTS to revision a7a3b94

third_party/ots/src/vdmx.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 "vdmx.h"
 
 // VDMX - Vertical Device Metrics
 // http://www.microsoft.com/typography/otspec/vdmx.htm
 
 #define TABLE_NAME "VDMX"
 
 #define DROP_THIS_TABLE(...) \
   do { \
-    OTS_FAILURE_MSG_(file, TABLE_NAME ": " __VA_ARGS__); \
+    OTS_FAILURE_MSG_(font->file, TABLE_NAME ": " __VA_ARGS__); \
     OTS_FAILURE_MSG("Table discarded"); \
-    delete file->vdmx; \
-    file->vdmx = 0; \
+    delete font->vdmx; \
+    font->vdmx = 0; \
   } while (0)
 
 namespace ots {
 
-bool ots_vdmx_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+bool ots_vdmx_parse(Font *font, const uint8_t *data, size_t length) {
   Buffer table(data, length);
-  file->vdmx = new OpenTypeVDMX;
-  OpenTypeVDMX * const vdmx = file->vdmx;
+  font->vdmx = new OpenTypeVDMX;
+  OpenTypeVDMX * const vdmx = font->vdmx;
 
   if (!table.ReadU16(&vdmx->version) ||
       !table.ReadU16(&vdmx->num_recs) ||
       !table.ReadU16(&vdmx->num_ratios)) {
     return OTS_FAILURE_MSG("Failed to read table header");
   }
 
   if (vdmx->version > 1) {
     DROP_THIS_TABLE("bad version: %u", vdmx->version);
     return true;  // continue transcoding
@@ skipping 78 matching lines @@
       }
 
       group.entries.push_back(vt);
     }
     vdmx->groups.push_back(group);
   }
 
   return true;
 }
 
-bool ots_vdmx_should_serialise(OpenTypeFile *file) {
-  if (!file->glyf) return false;  // this table is not for CFF fonts.
-  return file->vdmx != NULL;
+bool ots_vdmx_should_serialise(Font *font) {
+  if (!font->glyf) return false;  // this table is not for CFF fonts.
+  return font->vdmx != NULL;
 }
 
-bool ots_vdmx_serialise(OTSStream *out, OpenTypeFile *file) {
-  OpenTypeVDMX * const vdmx = file->vdmx;
+bool ots_vdmx_serialise(OTSStream *out, Font *font) {
+  OpenTypeVDMX * const vdmx = font->vdmx;
 
   if (!out->WriteU16(vdmx->version) ||
       !out->WriteU16(vdmx->num_recs) ||
       !out->WriteU16(vdmx->num_ratios)) {
     return OTS_FAILURE_MSG("Failed to write table header");
   }
 
   for (unsigned i = 0; i < vdmx->rat_ranges.size(); ++i) {
     const OpenTypeVDMXRatioRecord& rec = vdmx->rat_ranges[i];
     if (!out->Write(&rec.charset, 1) ||
@@ skipping 23 matching lines @@
           !out->WriteS16(vt.y_max) ||
           !out->WriteS16(vt.y_min)) {
         return OTS_FAILURE_MSG("Failed to write group %d entry %d", i, j);
       }
     }
   }
 
   return true;
 }
 
-void ots_vdmx_free(OpenTypeFile *file) {
-  delete file->vdmx;
+void ots_vdmx_reuse(Font *font, Font *other) {
+  font->vdmx = other->vdmx;
+  font->vdmx_reused = true;
+}
+
+void ots_vdmx_free(Font *font) {
+  delete font->vdmx;
 }
 
 }  // namespace ots
 
 #undef TABLE_NAME
 #undef DROP_THIS_TABLE