summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler/poppler-src/goo
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/goo')
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooHash.cc7
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooHash.h7
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooList.cc16
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooList.h8
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooString.cc9
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooString.h9
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gfile.cc1
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gfile.h1
8 files changed, 39 insertions, 19 deletions
diff --git a/Build/source/libs/poppler/poppler-src/goo/GooHash.cc b/Build/source/libs/poppler/poppler-src/goo/GooHash.cc
index cd39a5aee3f..620803eb603 100644
--- a/Build/source/libs/poppler/poppler-src/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/GooHash.cc
@@ -14,6 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2017 Albert Astals Cid <aacid@kde.org>
+// 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
//
// 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
@@ -154,7 +155,7 @@ void *GooHash::lookup(GooString *key) {
return p->val.p;
}
-int GooHash::lookupInt(GooString *key) {
+int GooHash::lookupInt(const GooString *key) {
GooHashBucket *p;
int h;
@@ -351,7 +352,7 @@ void GooHash::expand() {
gfree(oldTab);
}
-GooHashBucket *GooHash::find(GooString *key, int *h) {
+GooHashBucket *GooHash::find(const GooString *key, int *h) {
GooHashBucket *p;
if (unlikely(!key))
@@ -378,7 +379,7 @@ GooHashBucket *GooHash::find(const char *key, int *h) {
return nullptr;
}
-int GooHash::hash(GooString *key) {
+int GooHash::hash(const GooString *key) {
const char *p;
unsigned int h;
int i;
diff --git a/Build/source/libs/poppler/poppler-src/goo/GooHash.h b/Build/source/libs/poppler/poppler-src/goo/GooHash.h
index eda19e31409..57f883c6898 100644
--- a/Build/source/libs/poppler/poppler-src/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-src/goo/GooHash.h
@@ -14,6 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
+// 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
//
// 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
@@ -45,7 +46,7 @@ public:
void replace(GooString *key, void *val);
void replace(GooString *key, int val);
void *lookup(GooString *key);
- int lookupInt(GooString *key);
+ int lookupInt(const GooString *key);
void *lookup(const char *key);
int lookupInt(const char *key);
void *remove(GooString *key);
@@ -63,9 +64,9 @@ private:
GooHash& operator=(const GooHash &other);
void expand();
- GooHashBucket *find(GooString *key, int *h);
+ GooHashBucket *find(const GooString *key, int *h);
GooHashBucket *find(const char *key, int *h);
- int hash(GooString *key);
+ int hash(const GooString *key);
int hash(const char *key);
GBool deleteKeys; // set if key strings should be deleted
diff --git a/Build/source/libs/poppler/poppler-src/goo/GooList.cc b/Build/source/libs/poppler/poppler-src/goo/GooList.cc
index 6ce4952dc6a..e0e4875bad9 100644
--- a/Build/source/libs/poppler/poppler-src/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/GooList.cc
@@ -6,6 +6,20 @@
//
//========================================================================
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2018 Albert Astals Cid <aacid@kde.org>
+//
+// 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
+//
+//========================================================================
+
#include <config.h>
#ifdef USE_GCC_PRAGMAS
@@ -39,7 +53,7 @@ GooList::~GooList() {
gfree(data);
}
-GooList *GooList::copy() {
+GooList *GooList::copy() const {
GooList *ret;
ret = new GooList(length);
diff --git a/Build/source/libs/poppler/poppler-src/goo/GooList.h b/Build/source/libs/poppler/poppler-src/goo/GooList.h
index c83a0e36a8a..a0bc525d8da 100644
--- a/Build/source/libs/poppler/poppler-src/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-src/goo/GooList.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) 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2012, 2018 Albert Astals Cid <aacid@kde.org>
//
// 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
@@ -48,16 +48,16 @@ public:
//----- general
// Get the number of elements.
- int getLength() { return length; }
+ int getLength() const { return length; }
// Returns a (shallow) copy of this list.
- GooList *copy();
+ GooList *copy() const;
//----- ordered list support
// Return the <i>th element.
// Assumes 0 <= i < length.
- void *get(int i) { return data[i]; }
+ void *get(int i) const { return data[i]; }
// Replace the <i>th element.
// Assumes 0 <= i < length.
diff --git a/Build/source/libs/poppler/poppler-src/goo/GooString.cc b/Build/source/libs/poppler/poppler-src/goo/GooString.cc
index d67b8752622..0cf32a3a6d7 100644
--- a/Build/source/libs/poppler/poppler-src/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/GooString.cc
@@ -26,6 +26,7 @@
// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
// Copyright (C) 2015 William Bader <williambader@hotmail.com>
// Copyright (C) 2016 Jakub Alba <jakubalba@gmail.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
//
// 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
@@ -206,7 +207,7 @@ GooString::GooString(const char *sA, int lengthA) {
Set(sA, lengthA);
}
-GooString::GooString(GooString *str, int idx, int lengthA) {
+GooString::GooString(const GooString *str, int idx, int lengthA) {
s = nullptr;
length = 0;
assert(idx + lengthA <= str->length);
@@ -268,7 +269,7 @@ GooString *GooString::append(char c) {
return append((const char*)&c, 1);
}
-GooString *GooString::append(GooString *str) {
+GooString *GooString::append(const GooString *str) {
return append(str->getCString(), str->getLength());
}
@@ -739,7 +740,7 @@ GooString *GooString::insert(int i, char c) {
return insert(i, (const char*)&c, 1);
}
-GooString *GooString::insert(int i, GooString *str) {
+GooString *GooString::insert(int i, const GooString *str) {
return insert(i, str->getCString(), str->getLength());
}
@@ -789,7 +790,7 @@ GooString *GooString::lowerCase() {
return this;
}
-int GooString::cmp(GooString *str) const {
+int GooString::cmp(const GooString *str) const {
int n1, n2, i, x;
char *p1, *p2;
diff --git a/Build/source/libs/poppler/poppler-src/goo/GooString.h b/Build/source/libs/poppler/poppler-src/goo/GooString.h
index 49f2888eb28..87fd5a8559b 100644
--- a/Build/source/libs/poppler/poppler-src/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-src/goo/GooString.h
@@ -23,6 +23,7 @@
// Copyright (C) 2015 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
//
// 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
@@ -64,7 +65,7 @@ public:
GooString(const char *sA, int lengthA);
// Create a string from <lengthA> chars at <idx> in <str>.
- GooString(GooString *str, int idx, int lengthA);
+ GooString(const GooString *str, int idx, int lengthA);
// Set content of a string to <newStr>. If <newLen> is CALC_STRING_LEN, then
// length of the string will be calculated with strlen(). Otherwise we assume
@@ -132,7 +133,7 @@ public:
// Append a character or string.
GooString *append(char c);
- GooString *append(GooString *str);
+ GooString *append(const GooString *str);
GooString *append(const char *str, int lengthA=CALC_STRING_LEN);
// Append a formatted string.
@@ -141,7 +142,7 @@ public:
// Insert a character or string.
GooString *insert(int i, char c);
- GooString *insert(int i, GooString *str);
+ GooString *insert(int i, const GooString *str);
GooString *insert(int i, const char *str, int lengthA=CALC_STRING_LEN);
// Delete a character or range of characters.
@@ -152,7 +153,7 @@ public:
GooString *lowerCase();
// Compare two strings: -1:< 0:= +1:>
- int cmp(GooString *str) const;
+ int cmp(const GooString *str) const;
int cmpN(GooString *str, int n) const;
int cmp(const char *sA) const;
int cmpN(const char *sA, int n) const;
diff --git a/Build/source/libs/poppler/poppler-src/goo/gfile.cc b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
index 0c425319b6f..381a0ce265d 100644
--- a/Build/source/libs/poppler/poppler-src/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
@@ -26,6 +26,7 @@
// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
// Copyright (C) 2013, 2017 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2017 Christoph Cullmann <cullmann@kde.org>
+// Copyright (C) 2018 Mojca Miklavec <mojca@macports.org>
//
// 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
diff --git a/Build/source/libs/poppler/poppler-src/goo/gfile.h b/Build/source/libs/poppler/poppler-src/goo/gfile.h
index 436947b273f..25595aae6d4 100644
--- a/Build/source/libs/poppler/poppler-src/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-src/goo/gfile.h
@@ -24,6 +24,7 @@
// Copyright (C) 2014 Peter Breitenlohner <peb@mppmu.mpg.de>
// Copyright (C) 2017 Christoph Cullmann <cullmann@kde.org>
// Copyright (C) 2017 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2018 Mojca Miklavec <mojca@macports.org>
//
// 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