Remove GlobalParams::ccFontFiles
it was never filled so it was basically a noop
diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index 713cec7..04431b3 100644
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -756,16 +756,6 @@
return NULL;
}
- //----- CID font substitution
- if ((path = globalParams->findCCFontFile(
- ((GfxCIDFont *)this)->getCollection()))) {
- if ((fontLoc = getExternalFont(path, gTrue))) {
- error(errSyntaxWarning, -1, "Substituting font '{0:t}' for '{1:t}'",
- fontLoc->path, name);
- return fontLoc;
- }
- }
-
// failed to find a substitute font
return NULL;
}
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 110f4a6..5c355da 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -569,7 +569,6 @@
cMapDirs = new GooHash(gTrue);
toUnicodeDirs = new GooList();
fontFiles = new GooHash(gTrue);
- ccFontFiles = new GooHash(gTrue);
sysFonts = new SysFontList();
psExpandSmaller = gFalse;
psShrinkLarger = gTrue;
@@ -774,7 +773,6 @@
deleteGooHash(unicodeMaps, GooString);
deleteGooList(toUnicodeDirs, GooString);
deleteGooHash(fontFiles, GooString);
- deleteGooHash(ccFontFiles, GooString);
#ifdef _WIN32
deleteGooHash(substFiles, GooString);
#endif
@@ -1372,18 +1370,6 @@
}
#endif
-GooString *GlobalParams::findCCFontFile(GooString *collection) {
- GooString *path;
-
- lockGlobalParams;
- if ((path = (GooString *)ccFontFiles->lookup(collection))) {
- path = path->copy();
- }
- unlockGlobalParams;
- return path;
-}
-
-
GBool GlobalParams::getPSExpandSmaller() {
GBool f;
diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h
index 238b4f8..cd712e7 100644
--- a/poppler/GlobalParams.h
+++ b/poppler/GlobalParams.h
@@ -140,7 +140,6 @@
GooString *findSystemFontFile(GfxFont *font, SysFontType *type,
int *fontNum, GooString *substituteFontName = NULL,
GooString *base14Name = NULL);
- GooString *findCCFontFile(GooString *collection);
GBool getPSExpandSmaller();
GBool getPSShrinkLarger();
GBool getPSCenter();
@@ -250,8 +249,6 @@
#endif
GooHash *fontFiles; // font files: font name mapped to path
// [GString]
- GooHash *ccFontFiles; // character collection font files:
- // collection name mapped to path [GString]
SysFontList *sysFonts; // system fonts
GooString *psFile; // PostScript file or command (for xpdf)
GBool psExpandSmaller; // expand smaller pages to fill paper
