-
Notifications
You must be signed in to change notification settings - Fork 8
/
10123.diff
181 lines (162 loc) · 6.15 KB
/
10123.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
commit 3105b61e0912df397dd712632d8ea16269ff4d94
Author: Albert Astals Cid <[email protected]>
Date: Wed Sep 19 23:17:07 2018 +0200
Update (C)
diff --git a/poppler/OptionalContent.h b/poppler/OptionalContent.h
index b62b0ee6..6e9c52a6 100644
--- a/poppler/OptionalContent.h
+++ b/poppler/OptionalContent.h
@@ -1,23 +1,24 @@
//========================================================================
//
// OptionalContent.h
//
// Copyright 2007 Brad Hards <[email protected]>
// Copyright 2008 Carlos Garcia Campos <[email protected]>
// Copyright 2013, 2018 Albert Astals Cid <[email protected]>
+// Copyright 2018 Adam Reichold <[email protected]>
//
// Released under the GPL (version 2, or later, at your option)
//
//========================================================================
#ifndef OPTIONALCONTENT_H
#define OPTIONALCONTENT_H
#ifdef USE_GCC_PRAGMAS
#pragma interface
#endif
#include "Object.h"
#include "CharTypes.h"
#include <unordered_map>
#include <memory>
diff --git a/poppler/StructTreeRoot.cc b/poppler/StructTreeRoot.cc
index 4491f901..954b76a7 100644
--- a/poppler/StructTreeRoot.cc
+++ b/poppler/StructTreeRoot.cc
@@ -1,26 +1,27 @@
//========================================================================
//
// StructTreeRoot.cc
//
// This file is licensed under the GPLv2 or later
//
// Copyright 2013, 2014 Igalia S.L.
// Copyright 2014 Fabio D'Urso <[email protected]>
// Copyright 2017 Jan-Erik S <[email protected]>
// Copyright 2017, 2018 Albert Astals Cid <[email protected]>
// Copyright 2017, 2018 Adrian Johnson <[email protected]>
+// Copyright 2018, Adam Reichold <[email protected]>
//
//========================================================================
#ifdef USE_GCC_PRAGMAS
#pragma interface
#endif
#include "goo/GooString.h"
#include "StructTreeRoot.h"
#include "StructElement.h"
#include "PDFDoc.h"
#include "Object.h"
#include "Dict.h"
#include <set>
#include <assert.h>
diff --git a/poppler/StructTreeRoot.h b/poppler/StructTreeRoot.h
index e71b2ff7..90848649 100644
--- a/poppler/StructTreeRoot.h
+++ b/poppler/StructTreeRoot.h
@@ -1,24 +1,25 @@
//========================================================================
//
// StructTreeRoot.h
//
// This file is licensed under the GPLv2 or later
//
// Copyright 2013, 2014 Igalia S.L.
// Copyright 2018 Albert Astals Cid <[email protected]>
// Copyright 2018 Adrian Johnson <[email protected]>
+// Copyright 2018 Adam Reichold <[email protected]>
//
//========================================================================
#ifndef STRUCTTREEROOT_H
#define STRUCTTREEROOT_H
#ifdef USE_GCC_PRAGMAS
#pragma interface
#endif
#include "goo/gtypes.h"
#include "Object.h"
#include "StructElement.h"
#include <map>
#include <vector>
diff --git a/qt5/src/poppler-link.cc b/qt5/src/poppler-link.cc
index b85ee493..0ea2c461 100644
--- a/qt5/src/poppler-link.cc
+++ b/qt5/src/poppler-link.cc
@@ -1,36 +1,37 @@
/* poppler-link.cc: qt interface to poppler
* Copyright (C) 2006-2007, 2013, 2016-2018, Albert Astals Cid
* Copyright (C) 2007-2008, Pino Toscano <[email protected]>
* Copyright (C) 2010 Hib Eris <[email protected]>
* Copyright (C) 2012, Tobias Koenig <[email protected]>
* Copyright (C) 2012, Guillermo A. Amaral B. <[email protected]>
* Copyright (C) 2018 Intevation GmbH <[email protected]>
+ * Copyright (C) 2018 Adam Reichold <[email protected]>
* Adapting code from
* Copyright (C) 2004 by Enrico Ros <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <poppler-qt5.h>
#include <poppler-link-private.h>
#include <poppler-private.h>
#include <poppler-media.h>
#include <QtCore/QStringList>
#include "poppler-annotation-private.h"
#include "Link.h"
#include "Rendition.h"
diff --git a/qt5/src/poppler-optcontent.cc b/qt5/src/poppler-optcontent.cc
index f5fc6d7e..9d8bf7cb 100644
--- a/qt5/src/poppler-optcontent.cc
+++ b/qt5/src/poppler-optcontent.cc
@@ -1,36 +1,37 @@
/* poppler-optcontent.cc: qt interface to poppler
*
* Copyright (C) 2007, Brad Hards <[email protected]>
* Copyright (C) 2008, 2014, Pino Toscano <[email protected]>
* Copyright (C) 2008, Carlos Garcia Campos <[email protected]>
* Copyright (C) 2015-2018, Albert Astals Cid <[email protected]>
* Copyright (C) 2017, Hubert Figuière <[email protected]>
* Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <[email protected]>. Work sponsored by the LiMux project of the city of Munich
+ * Copyright (C) 2018 Adam Reichold <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "poppler-optcontent.h"
#include "poppler-optcontent-private.h"
#include "poppler-private.h"
#include "poppler-link-private.h"
#include <QtCore/QDebug>
#include <QtCore/QtAlgorithms>
#include "poppler/OptionalContent.h"
#include "poppler/Link.h"