AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SkPDF: revert changes to CMapName/Registry/Ordering in 3d01c62

Browse Source 
BUG=skia:5606
TBR=bungeman@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2305803002

Review-Url: https://codereview.chromium.org/2305803002
This commit is contained in:
halcanary 2016-09-01 14:10:00 -07:00 committed by Commit bot
parent d0634eeb56
commit 59be20c8d5
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pdf/SkPDFFont.cpp
View File

@ -426,9 +426,8 @@ void SkPDFType0Font::getFontSubset(SkPDFCanon* canon) {
} }
auto sysInfo = sk_make_sp<SkPDFDict>(); auto sysInfo = sk_make_sp<SkPDFDict>();
sysInfo->insertString("Registry", "Skia"); sysInfo->insertString("Registry", "Adobe");
// TODO: Registry+Ordering should be globally unique! sysInfo->insertString("Ordering", "Identity");
sysInfo->insertString("Ordering", "SkiaOrdering");
sysInfo->insertInt("Supplement", 0); sysInfo->insertInt("Supplement", 0);
newCIDFont->insertObject("CIDSystemInfo", std::move(sysInfo)); newCIDFont->insertObject("CIDSystemInfo", std::move(sysInfo));

6
src/pdf/SkPDFMakeToUnicodeCmap.cpp
View File

@ -25,8 +25,8 @@ static void append_tounicode_header(SkDynamicMemoryWStream* cmap,
// different. This is not a reference object. // different. This is not a reference object.
const char* kSysInfo = const char* kSysInfo =
"/CIDSystemInfo\n" "/CIDSystemInfo\n"
"<< /Registry (Skia)\n" "<< /Registry (Adobe)\n"
"/Ordering (SkiaOrdering)\n" "/Ordering (UCS)\n"
"/Supplement 0\n" "/Supplement 0\n"
">> def\n"; ">> def\n";
cmap->writeText(kSysInfo); cmap->writeText(kSysInfo);
@ -35,7 +35,7 @@ static void append_tounicode_header(SkDynamicMemoryWStream* cmap,
// /CMapType 2 means ToUnicode. // /CMapType 2 means ToUnicode.
// Codespace range just tells the PDF processor the valid range. // Codespace range just tells the PDF processor the valid range.
const char* kTypeInfoHeader = const char* kTypeInfoHeader =
"/CMapName /Skia-Identity-SkiaOrdering def\n" "/CMapName /Adobe-Identity-UCS def\n"
"/CMapType 2 def\n" "/CMapType 2 def\n"
"1 begincodespacerange\n"; "1 begincodespacerange\n";
cmap->writeText(kTypeInfoHeader); cmap->writeText(kTypeInfoHeader);