poppler/GfxFont.cc | 4 ---- poppler/GfxFont.h | 4 ---- poppler/PSOutputDev.cc | 18 ------------------ qt5/src/QPainterOutputDev.cc | 4 ++-- qt6/src/QPainterOutputDev.cc | 4 ++-- 5 files changed, 4 insertions(+), 30 deletions(-)
New commits: commit a973ccdf0ea93022401c6c5cedcdfcaa5cd26866 Author: Albert Astals Cid <[email protected]> Date: Fri Oct 22 22:53:37 2021 +0200 Remove remmnats of external ps cid bit-16 fonts diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc index b3f2b382..5155a9c9 100644 --- a/poppler/GfxFont.cc +++ b/poppler/GfxFont.cc @@ -174,7 +174,6 @@ GfxFontLoc::GfxFontLoc() { path = nullptr; fontNum = 0; - encoding = nullptr; substIdx = -1; } @@ -183,9 +182,6 @@ GfxFontLoc::~GfxFontLoc() if (path) { delete path; } - if (encoding) { - delete encoding; - } } //------------------------------------------------------------------------ diff --git a/poppler/GfxFont.h b/poppler/GfxFont.h index 9eadb879..f9263a59 100644 --- a/poppler/GfxFont.h +++ b/poppler/GfxFont.h @@ -131,10 +131,6 @@ public: // (if locType == gfxFontLocResident) int fontNum; // for TrueType collections // (if locType == gfxFontLocExternal) - GooString *encoding; // PS font encoding, only for 16-bit fonts - // (if locType == gfxFontLocResident) - int wMode; // writing mode, only for 16-bit fonts - // (if locType == gfxFontLocResident) int substIdx; // substitute font index // (if locType == gfxFontLocExternal, // and a Base-14 substitution was made) diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc index fe5da746..a13ab851 100644 --- a/poppler/PSOutputDev.cc +++ b/poppler/PSOutputDev.cc @@ -1908,7 +1908,6 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) GooString *psName; char buf[16]; bool subst; - const UnicodeMap *uMap; const char *charName; double xs, ys; int code; @@ -2050,23 +2049,6 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) } } - // handle encodings for substituted CID fonts - if (fontLoc->locType == gfxFontLocResident && fontLoc->fontType >= fontCIDType0) { - subst = true; - if (font16EncLen >= font16EncSize) { - font16EncSize += 16; - font16Enc = (PSFont16Enc *)greallocn(font16Enc, font16EncSize, sizeof(PSFont16Enc)); - } - font16Enc[font16EncLen].fontID = *font->getID(); - if ((uMap = globalParams->getUnicodeMap(fontLoc->encoding->toStr()))) { - font16Enc[font16EncLen].enc = fontLoc->encoding->copy(); - } else { - error(errSyntaxError, -1, "Couldn't find Unicode map for 16-bit font encoding '{0:t}'", fontLoc->encoding); - font16Enc[font16EncLen].enc = nullptr; - } - ++font16EncLen; - } - delete fontLoc; } diff --git a/qt5/src/QPainterOutputDev.cc b/qt5/src/QPainterOutputDev.cc index 645b3cad..f67e65fc 100644 --- a/qt5/src/QPainterOutputDev.cc +++ b/qt5/src/QPainterOutputDev.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Brad Hards <[email protected]> -// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019, 2021 Albert Astals Cid <[email protected]> // Copyright (C) 2008, 2010 Pino Toscano <[email protected]> // Copyright (C) 2009, 2011 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> @@ -479,7 +479,7 @@ void QPainterOutputDev::updateFont(GfxState *state) break; } case gfxFontLocResident: { // font resides in a PS printer - qDebug() << "Font Resident Encoding:" << fontLoc->encoding->c_str() << ", not implemented yet!"; + qDebug() << "Resident Font Resident not implemented yet!"; break; } diff --git a/qt6/src/QPainterOutputDev.cc b/qt6/src/QPainterOutputDev.cc index 645b3cad..f67e65fc 100644 --- a/qt6/src/QPainterOutputDev.cc +++ b/qt6/src/QPainterOutputDev.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Brad Hards <[email protected]> -// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019, 2021 Albert Astals Cid <[email protected]> // Copyright (C) 2008, 2010 Pino Toscano <[email protected]> // Copyright (C) 2009, 2011 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> @@ -479,7 +479,7 @@ void QPainterOutputDev::updateFont(GfxState *state) break; } case gfxFontLocResident: { // font resides in a PS printer - qDebug() << "Font Resident Encoding:" << fontLoc->encoding->c_str() << ", not implemented yet!"; + qDebug() << "Resident Font Resident not implemented yet!"; break; }
