Update OTS to revision a7a3b94

third_party/ots/src/maxp.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 "maxp.h"
 
 // maxp - Maximum Profile
 // http://www.microsoft.com/typography/otspec/maxp.htm
 
 #define TABLE_NAME "maxp"
 
 namespace ots {
 
-bool ots_maxp_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+bool ots_maxp_parse(Font *font, const uint8_t *data, size_t length) {
   Buffer table(data, length);
 
   OpenTypeMAXP *maxp = new OpenTypeMAXP;
-  file->maxp = maxp;
+  font->maxp = maxp;
 
   uint32_t version = 0;
   if (!table.ReadU32(&version)) {
     return OTS_FAILURE_MSG("Failed to read version of maxp table");
   }
 
   if (version >> 16 > 1) {
     return OTS_FAILURE_MSG("Bad maxp version %d", version);
   }
 
@@ skipping 36 matching lines @@
     if ((maxp->max_zones != 1) && (maxp->max_zones != 2)) {
       return OTS_FAILURE_MSG("Bad max zones %d in maxp", maxp->max_zones);
     }
   } else {
     maxp->version_1 = false;
   }
 
   return true;
 }
 
-bool ots_maxp_should_serialise(OpenTypeFile *file) {
-  return file->maxp != NULL;
+bool ots_maxp_should_serialise(Font *font) {
+  return font->maxp != NULL;
 }
 
-bool ots_maxp_serialise(OTSStream *out, OpenTypeFile *file) {
-  const OpenTypeMAXP *maxp = file->maxp;
+bool ots_maxp_serialise(OTSStream *out, Font *font) {
+  const OpenTypeMAXP *maxp = font->maxp;
 
   if (!out->WriteU32(maxp->version_1 ? 0x00010000 : 0x00005000) ||
       !out->WriteU16(maxp->num_glyphs)) {
     return OTS_FAILURE_MSG("Failed to write maxp version or number of glyphs");
   }
 
   if (!maxp->version_1) return true;
 
   if (!out->WriteU16(maxp->max_points) ||
       !out->WriteU16(maxp->max_contours) ||
@@ skipping 13 matching lines @@
   }
 
   if (!out->WriteU16(maxp->max_c_components) ||
       !out->WriteU16(maxp->max_c_depth)) {
     return OTS_FAILURE_MSG("Failed to write yet more maxp");
   }
 
   return true;
 }
 
-void ots_maxp_free(OpenTypeFile *file) {
-  delete file->maxp;
+void ots_maxp_reuse(Font *font, Font *other) {
+  font->maxp = other->maxp;
+  font->maxp_reused = true;
+}
+
+void ots_maxp_free(Font *font) {
+  delete font->maxp;
 }
 
 }  // namespace ots
 
 #undef TABLE_NAME