poppler/GlobalParams.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
New commits: commit d5d6dd939e06cd8048d9d8090502915b0488b1dd Author: Albert Astals Cid <[email protected]> Date: Sun Sep 23 22:41:12 2018 +0200 Some more NULL -> nullptr diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index b0c4c9b5..b07781ff 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -1040,13 +1040,13 @@ static struct { {"Helvetica-Bold", "n019004l.pfb", "arialbd.ttf"}, {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf"}, {"Helvetica-Oblique", "n019023l.pfb", "ariali.ttf"}, - {"Symbol", "s050000l.pfb", NULL}, + {"Symbol", "s050000l.pfb", nullptr}, {"Times-Bold", "n021004l.pfb", "timesbd.ttf"}, {"Times-BoldItalic", "n021024l.pfb", "timesbi.ttf"}, {"Times-Italic", "n021023l.pfb", "timesi.ttf"}, {"Times-Roman", "n021003l.pfb", "times.ttf"}, - {"ZapfDingbats", "d050000l.pfb", NULL}, - {NULL} + {"ZapfDingbats", "d050000l.pfb", nullptr}, + {nullptr, nullptr, nullptr} }; static const char *displayFontDirs[] = { @@ -1055,7 +1055,7 @@ static const char *displayFontDirs[] = { "/usr/share/fonts/default/Type1", "/usr/share/fonts/default/ghostscript", "/usr/share/fonts/type1/gsfonts", - NULL + nullptr }; void GlobalParams::setupBaseFonts(char *dir) { @@ -1069,14 +1069,14 @@ void GlobalParams::setupBaseFonts(char *dir) { continue; } fontName = new GooString(displayFontTab[i].name); - fileName = NULL; + fileName = nullptr; if (dir) { fileName = appendToPath(new GooString(dir), displayFontTab[i].t1FileName); if ((f = fopen(fileName->getCString(), "rb"))) { fclose(f); } else { delete fileName; - fileName = NULL; + fileName = nullptr; } } for (j = 0; !fileName && displayFontDirs[j]; ++j) { @@ -1086,7 +1086,7 @@ void GlobalParams::setupBaseFonts(char *dir) { fclose(f); } else { delete fileName; - fileName = NULL; + fileName = nullptr; } } if (!fileName) { @@ -1110,7 +1110,7 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font, const GooString *fontName = font->getName(); if (!fontName) return nullptr; - path = NULL; + path = nullptr; globalParamsLocker(); if ((fi = sysFonts->find(fontName, font->isFixedWidth(), gFalse))) { path = fi->path->copy(); commit 7ec06feed742af74e7b53a1df964eef8c3965e16 Author: Albert Astals Cid <[email protected]> Date: Sun Sep 23 22:38:55 2018 +0200 Fix build with -DFONT_CONFIGURATION=generic diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index 097386c1..b0c4c9b5 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -1103,7 +1103,7 @@ void GlobalParams::setupBaseFonts(char *dir) { GooString *GlobalParams::findSystemFontFile(GfxFont *font, SysFontType *type, int *fontNum, GooString * /*substituteFontName*/, - GooString * /*base14Name*/) { + const GooString * /*base14Name*/) { SysFontInfo *fi; GooString *path; _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
