diff options
| author |  halcanary <halcanary@google.com> | 2016-09-01 14:10:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-01 14:10:00 -0700 |
| commit | 59be20c8d532a81992a9ec73b6a39265a479fce5 (patch) | |
| tree | 7773ae565bd2022cba8307d20a54965a09c6daea /src/pdf | |
| parent | d0634eeb565d706df2e148a33f137c6edf42bf2e (diff) | |
SkPDF: revert changes to CMapName/Registry/Ordering in 3d01c62
BUG=skia:5606
TBR=bungeman@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2305803002
Review-Url: https://codereview.chromium.org/2305803002
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/SkPDFFont.cpp | 5 | ||||
| -rw-r--r-- | src/pdf/SkPDFMakeToUnicodeCmap.cpp | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp index 32e365388a..1e10f42b8d 100644 --- a/src/pdf/SkPDFFont.cpp +++ b/src/pdf/SkPDFFont.cpp @@ -426,9 +426,8 @@ void SkPDFType0Font::getFontSubset(SkPDFCanon* canon) { } auto sysInfo = sk_make_sp<SkPDFDict>(); - sysInfo->insertString("Registry", "Skia"); - // TODO: Registry+Ordering should be globally unique! - sysInfo->insertString("Ordering", "SkiaOrdering"); + sysInfo->insertString("Registry", "Adobe"); + sysInfo->insertString("Ordering", "Identity"); sysInfo->insertInt("Supplement", 0); newCIDFont->insertObject("CIDSystemInfo", std::move(sysInfo)); diff --git a/src/pdf/SkPDFMakeToUnicodeCmap.cpp b/src/pdf/SkPDFMakeToUnicodeCmap.cpp index 7fc5c59be3..b610934bcc 100644 --- a/src/pdf/SkPDFMakeToUnicodeCmap.cpp +++ b/src/pdf/SkPDFMakeToUnicodeCmap.cpp @@ -25,8 +25,8 @@ static void append_tounicode_header(SkDynamicMemoryWStream* cmap, // different. This is not a reference object. const char* kSysInfo = "/CIDSystemInfo\n" - "<< /Registry (Skia)\n" - "/Ordering (SkiaOrdering)\n" + "<< /Registry (Adobe)\n" + "/Ordering (UCS)\n" "/Supplement 0\n" ">> def\n"; cmap->writeText(kSysInfo); @@ -35,7 +35,7 @@ static void append_tounicode_header(SkDynamicMemoryWStream* cmap, // /CMapType 2 means ToUnicode. // Codespace range just tells the PDF processor the valid range. const char* kTypeInfoHeader = - "/CMapName /Skia-Identity-SkiaOrdering def\n" + "/CMapName /Adobe-Identity-UCS def\n" "/CMapType 2 def\n" "1 begincodespacerange\n"; cmap->writeText(kTypeInfoHeader); |