diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-05-21 04:55:02 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-05-21 04:55:02 +0000 |
commit | ca62aaaa9193dc1d3375de5ddba1ab1996aea67e (patch) | |
tree | 47ab6dc596be6179dcad3776f45eb1d01b203d71 /Build/source/libs/poppler/poppler-src/goo/GooString.h | |
parent | 0c746006a76d0275c549620a3b4ca5e836aa92c5 (diff) |
poppler 0.65.0
git-svn-id: svn://tug.org/texlive/trunk@47788 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/goo/GooString.h')
-rw-r--r-- | Build/source/libs/poppler/poppler-src/goo/GooString.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Build/source/libs/poppler/poppler-src/goo/GooString.h b/Build/source/libs/poppler/poppler-src/goo/GooString.h index 87fd5a8559b..78ebd85b81a 100644 --- a/Build/source/libs/poppler/poppler-src/goo/GooString.h +++ b/Build/source/libs/poppler/poppler-src/goo/GooString.h @@ -20,7 +20,7 @@ // Copyright (C) 2008-2010, 2012, 2014, 2017 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2012-2014 Fabio D'Urso <fabiodurso@hotmail.it> // Copyright (C) 2013 Jason Crain <jason@aquaticape.us> -// Copyright (C) 2015 Adam Reichold <adam.reichold@t-online.de> +// Copyright (C) 2015, 2018 Adam Reichold <adam.reichold@t-online.de> // Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich @@ -39,6 +39,7 @@ #include <stdarg.h> #include <stdlib.h> // for NULL +#include <string> #include "gtypes.h" #ifdef __clang__ @@ -171,6 +172,10 @@ public: // The caller owns the return value GooString *sanitizedName(GBool psmode) const; + // Conversion from and to std::string + explicit GooString(const std::string& str) : GooString(str.data(), str.size()) {} + std::string toStr() const { return std::string(getCString(), getLength()); } + private: GooString(const GooString &other); GooString& operator=(const GooString &other); |