poppler/GlobalParams.cc | 9 +-------- poppler/GlobalParams.h | 4 +--- utils/pdftops.cc | 10 +++++----- 3 files changed, 7 insertions(+), 16 deletions(-)
New commits: commit 3ab6b5ebf3b6c0d59bcb2ec68eae1aa95cab1d0e Author: William Bader <[email protected]> Date: Fri Mar 2 19:40:44 2012 +0100 Fix pdftops -passfonts regression This patch fixes pdftops -passfonts by using the new psFontPassthrough variable consistently and removing the old psSubstFonts and its setter and getter in GlobalParams. Bug 46744 diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index dffad4f..77a053d 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -23,7 +23,7 @@ // Copyright (C) 2007 Krzysztof Kowalczyk <[email protected]> // Copyright (C) 2007, 2009 Jonathan Kew <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> -// Copyright (C) 2009, 2011 William Bader <[email protected]> +// Copyright (C) 2009, 2011, 2012 William Bader <[email protected]> // Copyright (C) 2009 Kovid Goyal <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2010 Patrick Spendrin <[email protected]> @@ -579,7 +579,6 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir) psEmbedCIDPostScript = gTrue; psEmbedCIDTrueType = gTrue; psFontPassthrough = gFalse; - psSubstFonts = gTrue; psPreload = gFalse; psOPI = gFalse; psASCIIHex = gFalse; @@ -1964,12 +1963,6 @@ void GlobalParams::setPSEmbedCIDTrueType(GBool embed) { unlockGlobalParams; } -void GlobalParams::setPSSubstFonts(GBool substFonts) { - lockGlobalParams; - psSubstFonts = substFonts; - unlockGlobalParams; -} - void GlobalParams::setPSFontPassthrough(GBool passthrough) { lockGlobalParams; psFontPassthrough = passthrough; diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h index b75938e..d72793d 100644 --- a/poppler/GlobalParams.h +++ b/poppler/GlobalParams.h @@ -20,7 +20,7 @@ // Copyright (C) 2007 Krzysztof Kowalczyk <[email protected]> // Copyright (C) 2009 Jonathan Kew <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> -// Copyright (C) 2009, 2011 William Bader <[email protected]> +// Copyright (C) 2009, 2011, 2012 William Bader <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2011 Pino Toscano <[email protected]> // Copyright (C) 2012 Adrian Johnson <[email protected]> @@ -216,7 +216,6 @@ public: void setPSEmbedTrueType(GBool embed); void setPSEmbedCIDPostScript(GBool embed); void setPSEmbedCIDTrueType(GBool embed); - void setPSSubstFonts(GBool substFonts); void setPSFontPassthrough(GBool passthrough); void setPSPreload(GBool preload); void setPSOPI(GBool opi); @@ -315,7 +314,6 @@ private: GBool psEmbedTrueType; // embed TrueType fonts? GBool psEmbedCIDPostScript; // embed CID PostScript fonts? GBool psEmbedCIDTrueType; // embed CID TrueType fonts? - GBool psSubstFonts; // substitute missing fonts? GBool psFontPassthrough; // pass all fonts through as-is? GBool psPreload; // preload PostScript images and forms into // memory diff --git a/utils/pdftops.cc b/utils/pdftops.cc index 5cf3410..7f5a0ce 100644 --- a/utils/pdftops.cc +++ b/utils/pdftops.cc @@ -19,7 +19,7 @@ // Copyright (C) 2007-2008, 2010 Albert Astals Cid <[email protected]> // Copyright (C) 2009 Till Kamppeter <[email protected]> // Copyright (C) 2009 Sanjoy Mahajan <[email protected]> -// Copyright (C) 2009, 2011 William Bader <[email protected]> +// Copyright (C) 2009, 2011, 2012 William Bader <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> // @@ -92,7 +92,7 @@ static GBool noEmbedT1Fonts = gFalse; static GBool noEmbedTTFonts = gFalse; static GBool noEmbedCIDPSFonts = gFalse; static GBool noEmbedCIDTTFonts = gFalse; -static GBool noSubstFonts = gFalse; +static GBool fontPassthrough = gFalse; static GBool preload = gFalse; static char paperSize[15] = ""; static int paperWidth = -1; @@ -150,7 +150,7 @@ static const ArgDesc argDesc[] = { "don't embed CID PostScript fonts"}, {"-noembcidtt", argFlag, &noEmbedCIDTTFonts, 0, "don't embed CID TrueType fonts"}, - {"-passfonts", argFlag, &noSubstFonts,0, + {"-passfonts", argFlag, &fontPassthrough,0, "don't substitute missing fonts"}, {"-preload", argFlag, &preload, 0, "preload images and forms"}, @@ -300,8 +300,8 @@ int main(int argc, char *argv[]) { if (noEmbedCIDTTFonts) { globalParams->setPSEmbedCIDTrueType(!noEmbedCIDTTFonts); } - if (noSubstFonts) { - globalParams->setPSSubstFonts(!noSubstFonts); + if (fontPassthrough) { + globalParams->setPSFontPassthrough(fontPassthrough); } if (preload) { globalParams->setPSPreload(preload); _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
