Revert of Update OTS to revision 6d2e08b

third_party/ots/src/cmap.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 "cmap.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 1005 matching lines @@
     for (unsigned i = 0; i < num_groups; ++i) {
       if (!out->WriteU32(groups[i].start_range) ||
           !out->WriteU32(groups[i].end_range) ||
           !out->WriteU32(groups[i].start_glyph_id)) {
         return OTS_FAILURE();
       }
     }
   }
 
   const off_t table_end = out->Tell();
+  // We might have hanging bytes from the above's checksum which the OTSStream
+  // then merges into the table of offsets.
+  OTSStream::ChecksumState saved_checksum = out->SaveChecksumState();
+  out->ResetChecksum();
 
   // Now seek back and write the table of offsets
   if (!out->Seek(record_offset)) {
     return OTS_FAILURE();
   }
 
   if (have_034) {
     if (!out->WriteU16(0) ||
         !out->WriteU16(3) ||
         !out->WriteU32(offset_034 - table_start)) {
@@ skipping 45 matching lines @@
     if (!out->WriteU16(3) ||
         !out->WriteU16(10) ||
         !out->WriteU32(offset_31013 - table_start)) {
       return OTS_FAILURE();
     }
   }
 
   if (!out->Seek(table_end)) {
     return OTS_FAILURE();
   }
+  out->RestoreChecksum(saved_checksum);
 
   return true;
 }
 
 void ots_cmap_free(OpenTypeFile *file) {
   delete file->cmap;
 }
 
 }  // namespace ots
 
 #undef TABLE_NAME