Update OTS to revision a7a3b94

third_party/ots/src/os2.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 <string>
 
 #include "os2.h"
 #include "head.h"
 
 // OS/2 - OS/2 and Windows Metrics
 // http://www.microsoft.com/typography/otspec/os2.htm
 
 #define TABLE_NAME "OS/2"
 
 namespace ots {
 
-bool ots_os2_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+bool ots_os2_parse(Font *font, const uint8_t *data, size_t length) {
   Buffer table(data, length);
 
   OpenTypeOS2 *os2 = new OpenTypeOS2;
-  file->os2 = os2;
+  font->os2 = os2;
 
   if (!table.ReadU16(&os2->version) ||
       !table.ReadS16(&os2->avg_char_width) ||
       !table.ReadU16(&os2->weight_class) ||
       !table.ReadU16(&os2->width_class) ||
       !table.ReadU16(&os2->type) ||
       !table.ReadS16(&os2->subscript_x_size) ||
       !table.ReadS16(&os2->subscript_y_size) ||
       !table.ReadS16(&os2->subscript_x_offset) ||
       !table.ReadS16(&os2->subscript_y_offset) ||
@@ skipping 92 matching lines @@
     return OTS_FAILURE_MSG("Error reading more basic table fields");
   }
 
   // If bit 6 is set, then bits 0 and 5 must be clear.
   if (os2->selection & 0x40) {
     os2->selection &= 0xffdeu;
   }
 
   // the settings of bits 0 and 1 must be reflected in the macStyle bits
   // in the 'head' table.
-  if (!file->head) {
+  if (!font->head) {
     return OTS_FAILURE_MSG("Needed head table is missing from the font");
   }
   if ((os2->selection & 0x1) &&
-      !(file->head->mac_style & 0x2)) {
+      !(font->head->mac_style & 0x2)) {
     OTS_WARNING("adjusting Mac style (italic)");
-    file->head->mac_style |= 0x2;
+    font->head->mac_style |= 0x2;
   }
   if ((os2->selection & 0x2) &&
-      !(file->head->mac_style & 0x4)) {
+      !(font->head->mac_style & 0x4)) {
     OTS_WARNING("adjusting Mac style (underscore)");
-    file->head->mac_style |= 0x4;
+    font->head->mac_style |= 0x4;
   }
 
   // While bit 6 on implies that bits 0 and 1 of macStyle are clear,
   // the reverse is not true.
   if ((os2->selection & 0x40) &&
-      (file->head->mac_style & 0x3)) {
+      (font->head->mac_style & 0x3)) {
     OTS_WARNING("adjusting Mac style (regular)");
-    file->head->mac_style &= 0xfffcu;
+    font->head->mac_style &= 0xfffcu;
   }
 
   if ((os2->version < 4) &&
       (os2->selection & 0x300)) {
     // bit 8 and 9 must be unset in OS/2 table versions less than 4.
     return OTS_FAILURE_MSG("Version %d incompatible with selection %d", os2->version, os2->selection);
   }
 
   // mask reserved bits. use only 0..9 bits.
   os2->selection &= 0x3ff;
@@ skipping 70 matching lines @@
   }
 
   if (os2->upper_optical_pointsize < 2) {
     OTS_WARNING("'usUpperOpticalPointSize' is lower than 2: %d", os2->upper_optical_pointsize);
     os2->upper_optical_pointsize = 2;
   }
 
   return true;
 }
 
-bool ots_os2_should_serialise(OpenTypeFile *file) {
-  return file->os2 != NULL;
+bool ots_os2_should_serialise(Font *font) {
+  return font->os2 != NULL;
 }
 
-bool ots_os2_serialise(OTSStream *out, OpenTypeFile *file) {
-  const OpenTypeOS2 *os2 = file->os2;
+bool ots_os2_serialise(OTSStream *out, Font *font) {
+  const OpenTypeOS2 *os2 = font->os2;
 
   if (!out->WriteU16(os2->version) ||
       !out->WriteS16(os2->avg_char_width) ||
       !out->WriteU16(os2->weight_class) ||
       !out->WriteU16(os2->width_class) ||
       !out->WriteU16(os2->type) ||
       !out->WriteS16(os2->subscript_x_size) ||
       !out->WriteS16(os2->subscript_y_size) ||
       !out->WriteS16(os2->subscript_x_offset) ||
       !out->WriteS16(os2->subscript_y_offset) ||
@@ skipping 55 matching lines @@
   }
 
   if (!out->WriteU16(os2->lower_optical_pointsize) ||
       !out->WriteU16(os2->upper_optical_pointsize)) {
     return OTS_FAILURE_MSG("Failed to write version 5-specific fields");
   }
 
   return true;
 }
 
-void ots_os2_free(OpenTypeFile *file) {
-  delete file->os2;
+void ots_os2_reuse(Font *font, Font *other) {
+  font->os2 = other->os2;
+  font->os2_reused = true;
+}
+
+void ots_os2_free(Font *font) {
+  delete font->os2;
 }
 
 }  // namespace ots
 
 #undef TABLE_NAME