--- poppler-git-2mar12/poppler/GlobalParams.cc- 2012-03-02 00:14:55.880912736 +0100 +++ poppler-git-2mar12/poppler/GlobalParams.cc 2012-03-02 02:46:02.912228920 +0100 @@ -579,7 +579,6 @@ psEmbedCIDPostScript = gTrue; psEmbedCIDTrueType = gTrue; psFontPassthrough = gFalse; - psSubstFonts = gTrue; psPreload = gFalse; psOPI = gFalse; psASCIIHex = gFalse; @@ -1964,12 +1963,6 @@ unlockGlobalParams; } -void GlobalParams::setPSSubstFonts(GBool substFonts) { - lockGlobalParams; - psSubstFonts = substFonts; - unlockGlobalParams; -} - void GlobalParams::setPSFontPassthrough(GBool passthrough) { lockGlobalParams; psFontPassthrough = passthrough; --- poppler-git-2mar12/poppler/GlobalParams.h- 2012-03-02 00:14:55.881912739 +0100 +++ poppler-git-2mar12/poppler/GlobalParams.h 2012-03-02 02:46:02.913228913 +0100 @@ -216,7 +216,6 @@ 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 @@ 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 --- poppler-git-2mar12/utils/pdftops.cc- 2012-03-02 00:14:55.918912850 +0100 +++ poppler-git-2mar12/utils/pdftops.cc 2012-03-02 02:44:55.979084317 +0100 @@ -92,7 +92,7 @@ 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 @@ "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 @@ if (noEmbedCIDTTFonts) { globalParams->setPSEmbedCIDTrueType(!noEmbedCIDTTFonts); } - if (noSubstFonts) { - globalParams->setPSSubstFonts(!noSubstFonts); + if (fontPassthrough) { + globalParams->setPSFontPassthrough(fontPassthrough); } if (preload) { globalParams->setPSPreload(preload);