Update OTS to revision a7a3b94

third_party/ots/src/post.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 "post.h"
 
 #include "maxp.h"
 
 // post - PostScript
 // http://www.microsoft.com/typography/otspec/post.htm
 
 #define TABLE_NAME "post"
 
 namespace ots {
 
-bool ots_post_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+bool ots_post_parse(Font *font, const uint8_t *data, size_t length) {
   Buffer table(data, length);
 
   OpenTypePOST *post = new OpenTypePOST;
-  file->post = post;
+  font->post = post;
 
   if (!table.ReadU32(&post->version) ||
       !table.ReadU32(&post->italic_angle) ||
       !table.ReadS16(&post->underline) ||
       !table.ReadS16(&post->underline_thickness) ||
       !table.ReadU32(&post->is_fixed_pitch)) {
     return OTS_FAILURE_MSG("Failed to read post header");
   }
 
   if (post->underline_thickness < 0) {
@@ skipping 15 matching lines @@
   // when serialising
   if (!table.Skip(16)) {
     return OTS_FAILURE_MSG("Failed to skip memory usage in post table");
   }
 
   uint16_t num_glyphs = 0;
   if (!table.ReadU16(&num_glyphs)) {
     return OTS_FAILURE_MSG("Failed to read number of glyphs");
   }
 
-  if (!file->maxp) {
+  if (!font->maxp) {
     return OTS_FAILURE_MSG("No maxp table required by post table");
   }
 
   if (num_glyphs == 0) {
-    if (file->maxp->num_glyphs > 258) {
+    if (font->maxp->num_glyphs > 258) {
       return OTS_FAILURE_MSG("Can't have no glyphs in the post table if there are more than 256 glyphs in the font");
     }
     OTS_WARNING("table version is 1, but no glyf names are found");
     // workaround for fonts in http://www.fontsquirrel.com/fontface
     // (e.g., yataghan.ttf).
     post->version = 0x00010000;
     return true;
   }
 
-  if (num_glyphs != file->maxp->num_glyphs) {
+  if (num_glyphs != font->maxp->num_glyphs) {
     // Note: Fixedsys500c.ttf seems to have inconsistent num_glyphs values.
     return OTS_FAILURE_MSG("Bad number of glyphs in post table %d", num_glyphs);
   }
 
   post->glyph_name_index.resize(num_glyphs);
   for (unsigned i = 0; i < num_glyphs; ++i) {
     if (!table.ReadU16(&post->glyph_name_index[i])) {
       return OTS_FAILURE_MSG("Failed to read post information for glyph %d", i);
     }
     // Note: A strict interpretation of the specification requires name indexes
@@ skipping 31 matching lines @@
 
     offset -= 258;
     if (offset >= num_strings) {
       return OTS_FAILURE_MSG("Bad string index %d", offset);
     }
   }
 
   return true;
 }
 
-bool ots_post_should_serialise(OpenTypeFile *file) {
-  return file->post != NULL;
+bool ots_post_should_serialise(Font *font) {
+  return font->post != NULL;
 }
 
-bool ots_post_serialise(OTSStream *out, OpenTypeFile *file) {
-  const OpenTypePOST *post = file->post;
+bool ots_post_serialise(OTSStream *out, Font *font) {
+  const OpenTypePOST *post = font->post;
 
   // OpenType with CFF glyphs must have v3 post table.
-  if (file->post && file->cff && file->post->version != 0x00030000) {
+  if (font->post && font->cff && font->post->version != 0x00030000) {
     return OTS_FAILURE_MSG("Bad post version %x", post->version);
   }
 
   if (!out->WriteU32(post->version) ||
       !out->WriteU32(post->italic_angle) ||
       !out->WriteS16(post->underline) ||
       !out->WriteS16(post->underline_thickness) ||
       !out->WriteU32(post->is_fixed_pitch) ||
       !out->WriteU32(0) ||
       !out->WriteU32(0) ||
@@ skipping 30 matching lines @@
     // Some ttf fonts (e.g., frank.ttf on Windows Vista) have zero-length name.
     // We allow them.
     if (string_length > 0 && !out->Write(s.data(), string_length)) {
       return OTS_FAILURE_MSG("Failed to write string length for string %d", i);
     }
   }
 
   return true;
 }
 
-void ots_post_free(OpenTypeFile *file) {
-  delete file->post;
+void ots_post_reuse(Font *font, Font *other) {
+  font->post = other->post;
+  font->post_reused = true;
+}
+
+void ots_post_free(Font *font) {
+  delete font->post;
 }
 
 }  // namespace ots
 
 #undef TABLE_NAME