diff options
author | Oliver Sander <oliver.sander@tu-dresden.de> | 2021-09-15 15:12:24 +0200 |
---|---|---|
committer | Albert Astals Cid <tsdgeos@yahoo.es> | 2021-09-16 10:09:59 +0000 |
commit | 609992087a1e9ba85e24e76f59235b06149c7354 (patch) | |
tree | 956d1698665356c18bf0761e9e4c8d8929aafa46 /glib/poppler-document.cc | |
parent | a646ed9b0a544b87d4998a7209b340970db6a53d (diff) |
Store GfxFont::encodingName by value, in a std::string
Storing by value saves various heap allocations. Using std::string
instead of GooString brings the code closer to standard C++.
Diffstat (limited to 'glib/poppler-document.cc')
-rw-r--r-- | glib/poppler-document.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc index 25cc39b4..fd080510 100644 --- a/glib/poppler-document.cc +++ b/glib/poppler-document.cc @@ -4,7 +4,7 @@ * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> * Copyright (C) 2018-2019 Marek Kasik <mkasik@redhat.com> * Copyright (C) 2019 Masamichi Hosoda <trueroad@trueroad.jp> - * Copyright (C) 2019, Oliver Sander <oliver.sander@tu-dresden.de> + * Copyright (C) 2019, 2021 Oliver Sander <oliver.sander@tu-dresden.de> * Copyright (C) 2020 Albert Astals Cid <aacid@kde.org> * * This program is free software; you can redistribute it and/or modify @@ -2712,14 +2712,13 @@ PopplerFontType poppler_fonts_iter_get_font_type(PopplerFontsIter *iter) */ const char *poppler_fonts_iter_get_encoding(PopplerFontsIter *iter) { - const GooString *encoding; FontInfo *info; info = iter->items[iter->index]; - encoding = info->getEncoding(); - if (encoding != nullptr) { - return encoding->c_str(); + const std::string &encoding = info->getEncoding(); + if (!encoding.empty()) { + return encoding.c_str(); } else { return nullptr; } |