diff options
author | William Bader <williambader@hotmail.com> | 2012-03-02 19:40:44 +0100 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2012-03-02 19:43:22 +0100 |
commit | 3ab6b5ebf3b6c0d59bcb2ec68eae1aa95cab1d0e (patch) | |
tree | 000a6cf6c7b6b94f4a78886ae8ddfee6bb27b40d /utils | |
parent | 6c1ee34424b1122c0a2222b776d8d475f7c555cd (diff) |
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
Diffstat (limited to 'utils')
-rw-r--r-- | utils/pdftops.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/pdftops.cc b/utils/pdftops.cc index 5cf3410c..7f5a0ce3 100644 --- a/utils/pdftops.cc +++ b/utils/pdftops.cc @@ -19,7 +19,7 @@ // Copyright (C) 2007-2008, 2010 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com> // Copyright (C) 2009 Sanjoy Mahajan <sanjoy@mit.edu> -// Copyright (C) 2009, 2011 William Bader <williambader@hotmail.com> +// Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com> // Copyright (C) 2010 Hib Eris <hib@hiberis.nl> // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de> // @@ -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); |