Update OTS to revision a7a3b94

third_party/ots/src/cvt.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 "cvt.h"
 
 // cvt - Control Value Table
 // http://www.microsoft.com/typography/otspec/cvt.htm
 
 #define TABLE_NAME "cvt"
 
 namespace ots {
 
-bool ots_cvt_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
+bool ots_cvt_parse(Font *font, const uint8_t *data, size_t length) {
   Buffer table(data, length);
 
   OpenTypeCVT *cvt = new OpenTypeCVT;
-  file->cvt = cvt;
+  font->cvt = cvt;
 
   if (length >= 128 * 1024u) {
     return OTS_FAILURE_MSG("Length (%d) > 120K");  // almost all cvt tables are less than 4k bytes.
   }
 
   if (length % 2 != 0) {
     return OTS_FAILURE_MSG("Uneven cvt length (%d)", length);
   }
 
   if (!table.Skip(length)) {
     return OTS_FAILURE_MSG("Length too high");
   }
 
   cvt->data = data;
   cvt->length = length;
   return true;
 }
 
-bool ots_cvt_should_serialise(OpenTypeFile *file) {
-  if (!file->glyf) {
+bool ots_cvt_should_serialise(Font *font) {
+  if (!font->glyf) {
     return false;  // this table is not for CFF fonts.
   }
-  return file->cvt != NULL;
+  return font->cvt != NULL;
 }
 
-bool ots_cvt_serialise(OTSStream *out, OpenTypeFile *file) {
-  const OpenTypeCVT *cvt = file->cvt;
+bool ots_cvt_serialise(OTSStream *out, Font *font) {
+  const OpenTypeCVT *cvt = font->cvt;
 
   if (!out->Write(cvt->data, cvt->length)) {
     return OTS_FAILURE_MSG("Failed to write CVT table");
   }
 
   return true;
 }
 
-void ots_cvt_free(OpenTypeFile *file) {
-  delete file->cvt;
+void ots_cvt_reuse(Font *font, Font *other) {
+  font->cvt = other->cvt;
+  font->cvt_reused = true;
+}
+
+void ots_cvt_free(Font *font) {
+  delete font->cvt;
 }
 
 }  // namespace ots
 
 #undef TABLE_NAME