summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler/poppler-src/poppler/OutputDev.h
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-05-21 04:55:02 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-05-21 04:55:02 +0000
commitca62aaaa9193dc1d3375de5ddba1ab1996aea67e (patch)
tree47ab6dc596be6179dcad3776f45eb1d01b203d71 /Build/source/libs/poppler/poppler-src/poppler/OutputDev.h
parent0c746006a76d0275c549620a3b4ca5e836aa92c5 (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/poppler/OutputDev.h')
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/OutputDev.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/Build/source/libs/poppler/poppler-src/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-src/poppler/OutputDev.h
index 9dc4c3e005d..52635743838 100644
--- a/Build/source/libs/poppler/poppler-src/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/OutputDev.h
@@ -25,6 +25,7 @@
// Copyright (C) 2012 William Bader <williambader@hotmail.com>
// Copyright (C) 2017, 2018 Oliver Sander <oliver.sander@tu-dresden.de>
// 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
+// Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -43,10 +44,13 @@
#include "CharTypes.h"
#include "Object.h"
#include "PopplerCache.h"
+#include "ProfileData.h"
+#include <memory>
+#include <unordered_map>
+#include <string>
class Annot;
class Dict;
-class GooHash;
class GooString;
class GfxState;
class Gfx;
@@ -80,7 +84,6 @@ public:
: iccColorSpaceCache(5)
#endif
{
- profileHash = nullptr;
}
// Destructor.
@@ -333,9 +336,9 @@ public:
virtual void psXObject(Stream * /*psStream*/, Stream * /*level1Stream*/) {}
//----- Profiling
- virtual void startProfile();
- virtual GooHash *getProfileHash() {return profileHash; }
- virtual GooHash *endProfile();
+ void startProfile();
+ std::unordered_map<std::string, ProfileData>* getProfileHash() const { return profileHash.get(); }
+ std::unique_ptr<std::unordered_map<std::string, ProfileData>> endProfile();
//----- transparency groups and soft masks
virtual GBool checkTransparencyGroup(GfxState * /*state*/, GBool /*knockout*/) { return gTrue; }
@@ -365,7 +368,7 @@ private:
double defCTM[6]; // default coordinate transform matrix
double defICTM[6]; // inverse of default CTM
- GooHash *profileHash;
+ std::unique_ptr<std::unordered_map<std::string, ProfileData>> profileHash;
#ifdef USE_CMS
PopplerCache iccColorSpaceCache;