poppler/GlobalParams.cc | 8 ++------ poppler/GlobalParams.h | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-)
New commits: commit 00aea3562ec628266fe957bfdb8f1188e1beeb4b Author: Albert Astals Cid <aa...@kde.org> Date: Fri Jan 3 14:15:49 2020 +0100 Remove GlobalParams::getUnicodeMap2 GlobalParams::getUnicodeMap was just calling GlobalParams::getUnicodeMap2 so move the code of this one to the other one and save ourselves having one function that just calls the other diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index ea5d8125..bbc2e668 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -15,7 +15,7 @@ // // Copyright (C) 2005 Martin Kretzschmar <mart...@gnome.org> // Copyright (C) 2005, 2006 Kristian Høgsberg <k...@redhat.com> -// Copyright (C) 2005, 2007-2010, 2012, 2015, 2017-2019 Albert Astals Cid <aa...@kde.org> +// Copyright (C) 2005, 2007-2010, 2012, 2015, 2017-2020 Albert Astals Cid <aa...@kde.org> // Copyright (C) 2005 Jonathan Blandford <j...@redhat.com> // Copyright (C) 2006, 2007 Jeff Muizelaar <j...@infidigm.net> // Copyright (C) 2006 Takashi Iwai <ti...@suse.de> @@ -1165,10 +1165,6 @@ CharCodeToUnicode *GlobalParams::getCIDToUnicode(const GooString *collection) { } UnicodeMap *GlobalParams::getUnicodeMap(GooString *encodingName) { - return getUnicodeMap2(encodingName); -} - -UnicodeMap *GlobalParams::getUnicodeMap2(GooString *encodingName) { UnicodeMap *map; if (!(map = getResidentUnicodeMap(encodingName))) { @@ -1185,7 +1181,7 @@ CMap *GlobalParams::getCMap(const GooString *collection, const GooString *cMapNa } UnicodeMap *GlobalParams::getTextEncoding() { - return getUnicodeMap2(textEncoding); + return getUnicodeMap(textEncoding); } std::vector<GooString*> *GlobalParams::getEncodingNames() diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h index 755cdc1a..795afcf5 100644 --- a/poppler/GlobalParams.h +++ b/poppler/GlobalParams.h @@ -13,7 +13,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2005, 2007-2010, 2012, 2015, 2017-2019 Albert Astals Cid <aa...@kde.org> +// Copyright (C) 2005, 2007-2010, 2012, 2015, 2017-2020 Albert Astals Cid <aa...@kde.org> // Copyright (C) 2005 Jonathan Blandford <j...@redhat.com> // Copyright (C) 2006 Takashi Iwai <ti...@suse.de> // Copyright (C) 2006 Kristian Høgsberg <k...@redhat.com> @@ -156,7 +156,6 @@ public: private: void parseNameToUnicode(const GooString *name); - UnicodeMap *getUnicodeMap2(GooString *encodingName); void scanEncodingDirs(); void addCIDToUnicode(const GooString *collection, const GooString *fileName); _______________________________________________ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler