SkPDF: Fix encoding of unichr outside of basic plane

src/pdf/SkPDFFont.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <ctype.h>
 
 #include "SkData.h"
@@ skipping 403 matching lines @@
     uint16_t fGlyphId;
     SkUnichar fUnicode;
 };
 
 struct BFRange {
     uint16_t fStart;
     uint16_t fEnd;
     SkUnichar fUnicode;
 };
 
+static void write_utf16be(SkDynamicMemoryWStream* wStream, SkUnichar utf32) {
+    uint16_t utf16[2] = {0, 0};
+    size_t len = SkUTF16_FromUnichar(utf32, utf16);
+    SkASSERT(len == 1 || len == 2);
+    SkPDFUtils::WriteUInt16BE(wStream, utf16[0]);
+    if (len == 2) {
+        SkPDFUtils::WriteUInt16BE(wStream, utf16[1]);
+    }
+}
+
 static void append_bfchar_section(const SkTDArray<BFChar>& bfchar,
                                   SkDynamicMemoryWStream* cmap) {
     // PDF spec defines that every bf* list can have at most 100 entries.
     for (int i = 0; i < bfchar.count(); i += 100) {
         int count = bfchar.count() - i;
         count = SkMin32(count, 100);
         cmap->writeDecAsText(count);
         cmap->writeText(" beginbfchar\n");
         for (int j = 0; j < count; ++j) {
             cmap->writeText("<");
-            cmap->writeHexAsText(bfchar[i + j].fGlyphId, 4);
+            SkPDFUtils::WriteUInt16BE(cmap, bfchar[i + j].fGlyphId);
             cmap->writeText("> <");
-            cmap->writeHexAsText(bfchar[i + j].fUnicode, 4);
+            write_utf16be(cmap, bfchar[i + j].fUnicode);
             cmap->writeText(">\n");
         }
         cmap->writeText("endbfchar\n");
     }
 }
 
 static void append_bfrange_section(const SkTDArray<BFRange>& bfrange,
                                    SkDynamicMemoryWStream* cmap) {
     // PDF spec defines that every bf* list can have at most 100 entries.
     for (int i = 0; i < bfrange.count(); i += 100) {
         int count = bfrange.count() - i;
         count = SkMin32(count, 100);
         cmap->writeDecAsText(count);
         cmap->writeText(" beginbfrange\n");
         for (int j = 0; j < count; ++j) {
             cmap->writeText("<");
-            cmap->writeHexAsText(bfrange[i + j].fStart, 4);
+            SkPDFUtils::WriteUInt16BE(cmap, bfrange[i + j].fStart);
             cmap->writeText("> <");
-            cmap->writeHexAsText(bfrange[i + j].fEnd, 4);
+            SkPDFUtils::WriteUInt16BE(cmap, bfrange[i + j].fEnd);
             cmap->writeText("> <");
-            cmap->writeHexAsText(bfrange[i + j].fUnicode, 4);
+            write_utf16be(cmap, bfrange[i + j].fUnicode);
             cmap->writeText(">\n");
         }
         cmap->writeText("endbfrange\n");
     }
 }
 
 // Generate <bfchar> and <bfrange> table according to PDF spec 1.4 and Adobe
 // Technote 5014.
 // The function is not static so we can test it in unit tests.
 //
@@ skipping 941 matching lines @@
     }
     return *canon->fCanEmbedTypeface.set(id, canEmbed);
 }
 
 void SkPDFFont::drop() {
     fTypeface = nullptr;
     fFontInfo = nullptr;
     fDescriptor = nullptr;
     this->SkPDFDict::drop();
 }