XPS ttc handling.

src/sfnt/SkOTTable_name.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkOTTable_name.h"
 
 #include "SkEndian.h"
 #include "SkString.h"
 #include "SkTSearch.h"
+#include "SkTemplates.h"
 #include "SkUtils.h"
 
 static SkUnichar SkUTF16BE_NextUnichar(const uint16_t** srcPtr) {
     SkASSERT(srcPtr && *srcPtr);
 
     const uint16_t* src = *srcPtr;
     SkUnichar c = SkEndian_SwapBE16(*src++);
 
     SkASSERT(!SkUTF16_IsLowSurrogate(c));
     if (SkUTF16_IsHighSurrogate(c)) {
@@ skipping 405 matching lines @@
     { 0x500a, "es-PR" }, //Spanish
     { 0x540a, "es-US" }, //Spanish
 };
 
 namespace {
 int BCP47FromLanguageIdCompare(const BCP47FromLanguageId* a, const BCP47FromLanguageId* b) {
     return a->languageID - b->languageID;
 }
 }
 
-template <typename D, typename S> static D* SkTAfter(S const * const ptr, size_t count = 1) {
-    return (D*)(ptr + count);
-}
-
-template <typename D, typename S> static D* SkTAddOffset(S const * const ptr, size_t byteOffset) {
-    return (D*)((char*)ptr + byteOffset);
-}
-
 bool SkOTTableName::Iterator::next(SkOTTableName::Iterator::Record& record) {
     const size_t nameRecordsCount = SkEndian_SwapBE16(fName.count);
     const SkOTTableName::Record* nameRecords = SkTAfter<const SkOTTableName::Record>(&fName);
     const SkOTTableName::Record* nameRecord;
 
     // Find the next record which matches the requested type.
     do {
         if (fIndex >= nameRecordsCount) {
             return false;
         }
 
         nameRecord = &nameRecords[fIndex];
         ++fIndex;
     } while (fType != -1 && nameRecord->nameID.fontSpecific != fType);
 
     const uint16_t stringTableOffset = SkEndian_SwapBE16(fName.stringOffset);
-    const char* stringTable = SkTAddOffset<char>(&fName, stringTableOffset);
+    const char* stringTable = SkTAddOffset<const char>(&fName, stringTableOffset);
 
     // Decode the name into UTF-8.
     const uint16_t nameOffset = SkEndian_SwapBE16(nameRecord->offset);
     const uint16_t nameLength = SkEndian_SwapBE16(nameRecord->length);
-    const char* nameString = SkTAddOffset<char>(stringTable, nameOffset);
+    const char* nameString = SkTAddOffset<const char>(stringTable, nameOffset);
     switch (nameRecord->platformID.value) {
         case SkOTTableName::Record::PlatformID::Windows:
             SkASSERT(SkOTTableName::Record::EncodingID::Windows::UnicodeBMPUCS2
                   == nameRecord->encodingID.windows.value
                   || SkOTTableName::Record::EncodingID::Windows::UnicodeUCS4
                   == nameRecord->encodingID.windows.value
                   || SkOTTableName::Record::EncodingID::Windows::Symbol
                   == nameRecord->encodingID.windows.value);
         case SkOTTableName::Record::PlatformID::Unicode:
         case SkOTTableName::Record::PlatformID::ISO:
@@ skipping 43 matching lines @@
     if (languageIndex >= 0) {
         record.language = BCP47FromLanguageID[languageIndex].bcp47;
         return true;
     }
 
     // Unknown language, return the BCP 47 code 'und' for 'undetermined'.
     SkASSERT(false);
     record.language = "und";
     return true;
 }