Update OTS to revision a7a3b94

third_party/ots/include/opentype-sanitiser.h

 // 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.
 
 #ifndef OPENTYPE_SANITISER_H_
 #define OPENTYPE_SANITISER_H_
 
 #if defined(_WIN32)
 #include <stdlib.h>
 typedef signed char int8_t;
@@ skipping 71 matching lines @@
 
     return WriteRaw(data, orig_length);
   }
 
   virtual bool Seek(off_t position) = 0;
   virtual off_t Tell() const = 0;
 
   virtual bool Pad(size_t bytes) {
     static const uint32_t kZero = 0;
     while (bytes >= 4) {
-      if (!WriteTag(kZero)) return false;
+      if (!Write(&kZero, 4)) return false;
       bytes -= 4;
     }
     while (bytes) {
       static const uint8_t kZerob = 0;
       if (!Write(&kZerob, 1)) return false;
       bytes--;
     }
     return true;
   }
 
@@ skipping 23 matching lines @@
 
   bool WriteS32(int32_t v) {
     v = htonl(v);
     return Write(&v, sizeof(v));
   }
 
   bool WriteR64(uint64_t v) {
     return Write(&v, sizeof(v));
   }
 
-  bool WriteTag(uint32_t v) {
-    return Write(&v, sizeof(v));
-  }
-
   void ResetChecksum() {
     assert((Tell() & 3) == 0);
     chksum_ = 0;
   }
 
   uint32_t chksum() const {
     return chksum_;
   }
 
  protected:
@@ skipping 17 matching lines @@
   public:
     OTSContext() {}
     virtual ~OTSContext() {}
 
     // Process a given OpenType file and write out a sanitised version
     //   output: a pointer to an object implementing the OTSStream interface. The
     //     sanitisied output will be written to this. In the even of a failure,
     //     partial output may have been written.
     //   input: the OpenType file
     //   length: the size, in bytes, of |input|
-    bool Process(OTSStream *output, const uint8_t *input, size_t length);
+    //   index: if the input is a font collection and index is specified, then
+    //     the corresponding font will be returned, otherwise the whole
+    //     collection. Ignored for non-collection fonts.
+    bool Process(OTSStream *output, const uint8_t *input, size_t length, uint32_t index = -1);
 
     // This function will be called when OTS is reporting an error.
     //   level: the severity of the generated message:
     //     0: error messages in case OTS fails to sanitize the font.
     //     1: warning messages about issue OTS fixed in the sanitized font.
     virtual void Message(int level, const char *format, ...) MSGFUNC_FMT_ATTR {}
 
     // This function will be called when OTS needs to decide what to do for a
     // font table.
     //   tag: table tag as an integer in big-endian byte order, independent of
     //   platform endianness
     virtual TableAction GetTableAction(uint32_t tag) { return ots::TABLE_ACTION_DEFAULT; }
 };
 
 }  // namespace ots
 
 #endif  // OPENTYPE_SANITISER_H_