Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package poppler for openSUSE:Factory checked
in at 2022-11-19 18:08:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/poppler (Old)
and /work/SRC/openSUSE:Factory/.poppler.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler"
Sat Nov 19 18:08:45 2022 rev:186 rq:1036626 version:22.11.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/poppler/poppler.changes 2022-10-12
18:24:20.405611795 +0200
+++ /work/SRC/openSUSE:Factory/.poppler.new.1597/poppler.changes
2022-11-19 18:08:51.722282885 +0100
@@ -1,0 +2,9 @@
+Thu Nov 17 16:46:43 UTC 2022 - Dirk Müller <dmuel...@suse.com>
+
+- update to 22.11.0:
+ core:
+ * CairoOutputDev: Update font after restore
+ * Protect against broken files
+ * Small code refactoring
+
+-------------------------------------------------------------------
Old:
----
poppler-22.10.0.tar.xz
poppler-22.10.0.tar.xz.sig
New:
----
poppler-22.11.0.tar.xz
poppler-22.11.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poppler.spec ++++++
--- /var/tmp/diff_new_pack.0PIdEv/_old 2022-11-19 18:08:52.458287046 +0100
+++ /var/tmp/diff_new_pack.0PIdEv/_new 2022-11-19 18:08:52.466287091 +0100
@@ -32,7 +32,7 @@
%define poppler_api 0.18
%define poppler_apipkg 0_18
Name: poppler%{?psuffix}
-Version: 22.10.0
+Version: 22.11.0
Release: 0
Summary: PDF Rendering Library
License: GPL-2.0-only OR GPL-3.0-only
++++++ poppler-22.10.0.tar.xz -> poppler-22.11.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/CMakeLists.txt
new/poppler-22.11.0/CMakeLists.txt
--- old/poppler-22.10.0/CMakeLists.txt 2022-10-03 18:11:20.000000000 +0200
+++ new/poppler-22.11.0/CMakeLists.txt 2022-11-01 09:40:01.000000000 +0100
@@ -39,7 +39,7 @@
endif()
set(POPPLER_MAJOR_VERSION "22")
-set(POPPLER_MINOR_VERSION_STRING "10")
+set(POPPLER_MINOR_VERSION_STRING "11")
# We want the string version to have 08 but the integer version can't have a
leading 0 since otherwise it's considered octal
# So strip a leading 0 if found in POPPLER_MINOR_VERSION_STRING and store the
result in POPPLER_MINOR_VERSION
string(REGEX REPLACE "^0?(.+)$" "\\1" POPPLER_MINOR_VERSION
"${POPPLER_MINOR_VERSION_STRING}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/ChangeLog
new/poppler-22.11.0/ChangeLog
--- old/poppler-22.10.0/ChangeLog 2022-10-03 18:17:24.000000000 +0200
+++ new/poppler-22.11.0/ChangeLog 2022-11-01 09:42:44.000000000 +0100
@@ -1,3 +1,130 @@
+commit cc665f757af6b87dd245d36e079dd44d8d2d2182
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Tue Nov 1 09:40:01 2022 +0100
+
+ poppler 22.11.0
+
+ CMakeLists.txt | 2 +-
+ NEWS | 6 ++++++
+ cpp/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt6/src/Doxyfile | 2 +-
+ 5 files changed, 10 insertions(+), 4 deletions(-)
+
+commit a296982e1d5b4968b2bd044d80647ae6f9267526
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Sun Oct 30 09:52:57 2022 +0100
+
+ Do not include a poppler/ file from a splash/ header
+
+ In general we should not include them at all, neither from the .cc
+ files, but at least keeping the .h clean is a step
+
+ splash/Splash.cc | 1 +
+ splash/SplashBitmap.cc | 1 +
+ splash/SplashBitmap.h | 6 ++++--
+ splash/SplashXPathScanner.cc | 3 ++-
+ utils/pdftoppm.cc | 2 +-
+ 5 files changed, 9 insertions(+), 4 deletions(-)
+
+commit bc4a0d9a2abfcd75d9b0ee4be3f7600905fe6001
+Author: Marek Kasik <mka...@redhat.com>
+Date: Fri Jun 24 22:01:27 2022 +0200
+
+ Form: Provide Unicode marker when ensuring fonts
+
+ Form::ensureFontsForAllCharacters() needs input text with Unicode
+ marker.
+ Provide such in FormFieldText::setContentCopy().
+
+ poppler/Form.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 111f38a722eedddd94faa52dda8c5e0da561fb41
+Author: Marek Kasik <mka...@redhat.com>
+Date: Fri Jun 24 22:00:09 2022 +0200
+
+ Cairo: Update font after restore
+
+ Update font after restore (Q operator) if font has changed.
+ This is important when entering text into forms if there
+ are characters shown by default font after characters
+ which needed new font.
+
+ New method getRef() where added to CairoFont class to
+ be able to easily compare fonts.
+
+ poppler/CairoFontEngine.h | 3 +++
+ poppler/CairoOutputDev.cc | 7 ++++++-
+ poppler/CairoOutputDev.h | 2 ++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+commit 907d05a6a141284aee22fbd16ab0a2fb4e0f2724
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Wed Oct 19 21:30:05 2022 +0200
+
+ Fix crash in file that wants to do huge transparency group
+
+ huge = 2147483016 x 2
+
+ Issue #1305
+
+ splash/SplashBitmap.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e53f5aae3bce7d09788f2ad62be998895fb9807b
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Wed Oct 19 21:15:29 2022 +0200
+
+ PSOutputDev::setupResources: Fix stack overflow in malformed doc
+
+ Issue #1304
+
+ poppler/PSOutputDev.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+commit a4ca3a96a6b1f65b335a1ea362e6c202e46ae055
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Wed Oct 19 15:51:43 2022 +0200
+
+ topIdx can't be negative
+
+ Fixes crash on broken files. Issue #1303
+
+ poppler/Form.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit e471f8e09bf2e38df0cf5df1acecbcca70685573
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Sun Oct 16 12:25:34 2022 +0200
+
+ Init all the fields of JPXStreamPrivate
+
+ oss-fuzz/52372
+
+ poppler/JPEG2000Stream.cc | 16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
+
+commit 5190c0d4369bd9f501922585140be4ec736e24f2
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Sun Oct 16 12:21:59 2022 +0200
+
+ No need to store smaskInData in priv
+
+ poppler/JPEG2000Stream.cc | 13 ++++---------
+ 1 file changed, 4 insertions(+), 9 deletions(-)
+
+commit 6263bb90b09326103b10e4c4edfbc5b84c884921
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Sun Oct 16 12:07:12 2022 +0200
+
+ Page label ranges can't start in < 0
+
+ oss-fuzz/52140
+
+ poppler/PageLabelInfo.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
commit 2b65dde7b0e402127b664aa1802ab990d59995b5
Author: Albert Astals Cid <aa...@kde.org>
Date: Mon Oct 3 18:11:20 2022 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/NEWS new/poppler-22.11.0/NEWS
--- old/poppler-22.10.0/NEWS 2022-10-03 18:11:20.000000000 +0200
+++ new/poppler-22.11.0/NEWS 2022-11-01 09:40:01.000000000 +0100
@@ -1,3 +1,9 @@
+Release 22.11.0:
+ core:
+ * CairoOutputDev: Update font after restore
+ * Protect against broken files
+ * Small code refactoring
+
Release 22.10.0:
core:
* SplashOutputDev::tilingPatternFill: Properly restore CTM on
failure. Issue #1292
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/cpp/Doxyfile
new/poppler-22.11.0/cpp/Doxyfile
--- old/poppler-22.10.0/cpp/Doxyfile 2022-10-03 18:11:20.000000000 +0200
+++ new/poppler-22.11.0/cpp/Doxyfile 2022-11-01 09:40:01.000000000 +0100
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 22.10.0
+PROJECT_NUMBER = 22.11.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/glib/reference/html/index.html
new/poppler-22.11.0/glib/reference/html/index.html
--- old/poppler-22.10.0/glib/reference/html/index.html 2022-10-03
18:16:40.000000000 +0200
+++ new/poppler-22.11.0/glib/reference/html/index.html 2022-11-01
09:41:54.000000000 +0100
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2"
cellspacing="0"><tr><th valign="middle"><p class="title">Poppler Reference
Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for Poppler 22.10.0
+ for Poppler 22.11.0
</p></div>
</div>
<hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poppler-22.10.0/glib/reference/html/poppler-Poppler-Features.html
new/poppler-22.11.0/glib/reference/html/poppler-Poppler-Features.html
--- old/poppler-22.10.0/glib/reference/html/poppler-Poppler-Features.html
2022-10-03 18:16:40.000000000 +0200
+++ new/poppler-22.11.0/glib/reference/html/poppler-Poppler-Features.html
2022-11-01 09:41:54.000000000 +0100
@@ -205,7 +205,7 @@
<hr>
<div class="refsect2">
<a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3>
-<pre class="programlisting">#define POPPLER_MINOR_VERSION (10)
+<pre class="programlisting">#define POPPLER_MINOR_VERSION (11)
</pre>
<p>The major version number of the poppler header files (e.g. in poppler
version
0.1.2 this is 1.)</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/poppler/CairoFontEngine.h
new/poppler-22.11.0/poppler/CairoFontEngine.h
--- old/poppler-22.10.0/poppler/CairoFontEngine.h 2022-10-03
18:11:20.000000000 +0200
+++ new/poppler-22.11.0/poppler/CairoFontEngine.h 2022-11-01
09:40:01.000000000 +0100
@@ -22,6 +22,7 @@
// Copyright (C) 2013 Thomas Freitag <thomas.frei...@alfa.de>
// Copyright (C) 2018 Adam Reichold <adam.reich...@t-online.de>
// Copyright (C) 2022 Oliver Sander <oliver.san...@tu-dresden.de>
+// Copyright (C) 2022 Marek Kasik <mka...@redhat.com>
//
// 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
@@ -59,6 +60,8 @@
bool isSubstitute() { return substitute; }
+ Ref getRef() { return ref; }
+
protected:
Ref ref;
cairo_font_face_t *cairo_font_face;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/poppler/CairoOutputDev.cc
new/poppler-22.11.0/poppler/CairoOutputDev.cc
--- old/poppler-22.10.0/poppler/CairoOutputDev.cc 2022-10-03
18:11:20.000000000 +0200
+++ new/poppler-22.11.0/poppler/CairoOutputDev.cc 2022-11-01
09:40:01.000000000 +0100
@@ -31,7 +31,7 @@
// Copyright (C) 2015 Suzuki Toshiya <mpsuz...@hiroshima-u.ac.jp>
// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company,
<i...@kdab.com>. Work sponsored by the LiMux project of the city of Munich
// Copyright (C) 2018, 2020 Adam Reichold <adam.reich...@t-online.de>
-// Copyright (C) 2019, 2020 Marek Kasik <mka...@redhat.com>
+// Copyright (C) 2019, 2020, 2022 Marek Kasik <mka...@redhat.com>
// Copyright (C) 2020 Michal <sudols...@gmail.com>
// Copyright (C) 2020, 2022 Oliver Sander <oliver.san...@tu-dresden.de>
// Copyright (C) 2021 Uli Schlachter <psyc...@znc.in>
@@ -357,6 +357,7 @@
elem.stroke_opacity = stroke_opacity;
elem.mask = mask ? cairo_pattern_reference(mask) : nullptr;
elem.mask_matrix = mask_matrix;
+ elem.fontRef = currentFont ? currentFont->getRef() : Ref::INVALID();
saveStateStack.push_back(elem);
if (strokePathClip) {
@@ -384,6 +385,10 @@
stroke_color = {};
stroke_opacity = saveStateStack.back().stroke_opacity;
+ if (saveStateStack.back().fontRef != (currentFont ? currentFont->getRef()
: Ref::INVALID())) {
+ needFontUpdate = true;
+ }
+
/* This isn't restored by cairo_restore() since we keep it in the
* output device. */
updateBlendMode(state);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/poppler/CairoOutputDev.h
new/poppler-22.11.0/poppler/CairoOutputDev.h
--- old/poppler-22.10.0/poppler/CairoOutputDev.h 2022-10-03
18:11:20.000000000 +0200
+++ new/poppler-22.11.0/poppler/CairoOutputDev.h 2022-11-01
09:40:01.000000000 +0100
@@ -27,6 +27,7 @@
// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company,
<i...@kdab.com>. Work sponsored by the LiMux project of the city of Munich
// Copyright (C) 2020 Michal <sudols...@gmail.com>
// Copyright (C) 2021 Christian Persch <c...@src.gnome.org>
+// Copyright (C) 2022 Marek Kasik <mka...@redhat.com>
//
// 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
@@ -381,6 +382,7 @@
double stroke_opacity;
cairo_pattern_t *mask; // can be null
cairo_matrix_t mask_matrix;
+ Ref fontRef;
};
std::vector<SaveStateElement> saveStateStack;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/poppler/Form.cc
new/poppler-22.11.0/poppler/Form.cc
--- old/poppler-22.10.0/poppler/Form.cc 2022-10-03 18:11:20.000000000 +0200
+++ new/poppler-22.11.0/poppler/Form.cc 2022-11-01 09:40:01.000000000 +0100
@@ -27,7 +27,7 @@
// Copyright 2019, 2020 Oliver Sander <oliver.san...@tu-dresden.de>
// Copyright 2019 Tomoyuki Kubota <himajin100...@gmail.com>
// Copyright 2019 João Netto <joaonetto...@gmail.com>
-// Copyright 2020, 2021 Marek Kasik <mka...@redhat.com>
+// Copyright 2020-2022 Marek Kasik <mka...@redhat.com>
// Copyright 2020 Thorsten Behrens <thorsten.behr...@cib.de>
// Copyright 2020 Klarälvdalens Datakonsult AB, a KDAB Group company,
<i...@kdab.com>. Work sponsored by Technische Universität Dresden
// Copyright 2021 Georgiy Sgibnev <geor...@sgibnev.com>. Work sponsored by
lab50.net.
@@ -1674,14 +1674,14 @@
Object fieldResourcesDictObj = obj.dictLookup("DR");
if (fieldResourcesDictObj.isDict()) {
GfxResources fieldResources(doc->getXRef(),
fieldResourcesDictObj.getDict(), form->getDefaultResources());
- const std::vector<Form::AddFontResult> newFonts =
form->ensureFontsForAllCharacters(new_content, fontName, &fieldResources);
+ const std::vector<Form::AddFontResult> newFonts =
form->ensureFontsForAllCharacters(content, fontName, &fieldResources);
// If we added new fonts to the Form object default
resuources we also need to add them (we only add the ref so this is cheap)
// to the field DR dictionary
for (const Form::AddFontResult &afr : newFonts) {
fieldResourcesDictObj.dictLookup("Font").dictAdd(afr.fontName.c_str(),
Object(afr.ref));
}
} else {
- form->ensureFontsForAllCharacters(new_content,
fontName);
+ form->ensureFontsForAllCharacters(content, fontName);
}
}
} else {
@@ -1845,6 +1845,10 @@
obj1 = dict->lookup("TI");
if (obj1.isInt()) {
topIdx = obj1.getInt();
+ if (topIdx < 0) {
+ error(errSyntaxError, -1, "FormFieldChoice:: invalid topIdx
entry\n");
+ topIdx = 0;
+ }
}
obj1 = Form::fieldLookup(dict, "Opt");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/poppler/JPEG2000Stream.cc
new/poppler-22.11.0/poppler/JPEG2000Stream.cc
--- old/poppler-22.10.0/poppler/JPEG2000Stream.cc 2022-10-03
18:11:20.000000000 +0200
+++ new/poppler-22.11.0/poppler/JPEG2000Stream.cc 2022-11-01
09:40:01.000000000 +0100
@@ -33,13 +33,12 @@
struct JPXStreamPrivate
{
- opj_image_t *image;
- int counter;
- int ccounter;
- int npixels;
- int ncomps;
- bool inited;
- int smaskInData;
+ opj_image_t *image = nullptr;
+ int counter = 0;
+ int ccounter = 0;
+ int npixels = 0;
+ int ncomps = 0;
+ bool inited = false;
void init2(OPJ_CODEC_FORMAT format, const unsigned char *buf, int length,
bool indexed);
};
@@ -81,10 +80,6 @@
JPXStream::JPXStream(Stream *strA) : FilterStream(strA)
{
priv = new JPXStreamPrivate;
- priv->inited = false;
- priv->image = nullptr;
- priv->npixels = 0;
- priv->ncomps = 0;
}
JPXStream::~JPXStream()
@@ -244,11 +239,11 @@
void JPXStream::init()
{
- Object oLen, cspace, smaskInData;
+ Object oLen, cspace, smaskInDataObj;
if (getDict()) {
oLen = getDict()->lookup("Length");
cspace = getDict()->lookup("ColorSpace");
- smaskInData = getDict()->lookup("SMaskInData");
+ smaskInDataObj = getDict()->lookup("SMaskInData");
}
int bufSize = BUFFER_INITIAL_SIZE;
@@ -264,11 +259,7 @@
}
}
- priv->smaskInData = 0;
- if (smaskInData.isInt()) {
- priv->smaskInData = smaskInData.getInt();
- }
-
+ const int smaskInData = smaskInDataObj.isInt() ? smaskInDataObj.getInt() :
0;
const std::vector<unsigned char> buf = str->toUnsignedChars(bufSize);
priv->init2(OPJ_CODEC_JP2, buf.data(), buf.size(), indexed);
@@ -292,7 +283,7 @@
}
priv->npixels = priv->image->comps[0].w * priv->image->comps[0].h;
priv->ncomps = priv->image->numcomps;
- if (alpha == 1 && priv->smaskInData == 0) {
+ if (alpha == 1 && smaskInData == 0) {
priv->ncomps--;
}
for (int component = 0; component < priv->ncomps; component++) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/poppler/PSOutputDev.cc
new/poppler-22.11.0/poppler/PSOutputDev.cc
--- old/poppler-22.10.0/poppler/PSOutputDev.cc 2022-10-03 18:11:20.000000000
+0200
+++ new/poppler-22.11.0/poppler/PSOutputDev.cc 2022-11-01 09:40:01.000000000
+0100
@@ -1908,8 +1908,13 @@
// process the Pattern's resource dictionary
Object pat = patDict.dictGetVal(i);
if (pat.isStream()) {
- Object resObj = pat.streamGetDict()->lookup("Resources");
+ Ref resObjRef;
+ Object resObj = pat.streamGetDict()->lookup("Resources",
&resObjRef);
if (resObj.isDict()) {
+ if (resObjRef != Ref::INVALID() &&
!resourceIDs.insert(resObjRef.num).second) {
+ error(errSyntaxWarning, -1,
"PSOutputDev::setupResources: Circular resources found.");
+ continue;
+ }
setupResources(resObj.getDict());
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/poppler/PageLabelInfo.cc
new/poppler-22.11.0/poppler/PageLabelInfo.cc
--- old/poppler-22.10.0/poppler/PageLabelInfo.cc 2022-10-03
18:11:20.000000000 +0200
+++ new/poppler-22.11.0/poppler/PageLabelInfo.cc 2022-11-01
09:40:01.000000000 +0100
@@ -84,7 +84,10 @@
if (!obj.isInt()) {
continue;
}
- int base = obj.getInt();
+ const int base = obj.getInt();
+ if (base < 0) {
+ continue;
+ }
obj = nums.arrayGet(i + 1);
if (!obj.isDict()) {
continue;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/qt5/src/Doxyfile
new/poppler-22.11.0/qt5/src/Doxyfile
--- old/poppler-22.10.0/qt5/src/Doxyfile 2022-10-03 18:11:20.000000000
+0200
+++ new/poppler-22.11.0/qt5/src/Doxyfile 2022-11-01 09:40:01.000000000
+0100
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 22.10.0
+PROJECT_NUMBER = 22.11.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/qt6/src/Doxyfile
new/poppler-22.11.0/qt6/src/Doxyfile
--- old/poppler-22.10.0/qt6/src/Doxyfile 2022-10-03 18:11:20.000000000
+0200
+++ new/poppler-22.11.0/qt6/src/Doxyfile 2022-11-01 09:40:01.000000000
+0100
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 22.10.0
+PROJECT_NUMBER = 22.11.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/splash/Splash.cc
new/poppler-22.11.0/splash/Splash.cc
--- old/poppler-22.10.0/splash/Splash.cc 2022-10-03 18:11:20.000000000
+0200
+++ new/poppler-22.11.0/splash/Splash.cc 2022-11-01 09:40:01.000000000
+0100
@@ -40,6 +40,7 @@
#include <cmath>
#include "goo/gmem.h"
#include "goo/GooLikely.h"
+#include "poppler/GfxState.h"
#include "poppler/Error.h"
#include "SplashErrorCodes.h"
#include "SplashMath.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/splash/SplashBitmap.cc
new/poppler-22.11.0/splash/SplashBitmap.cc
--- old/poppler-22.10.0/splash/SplashBitmap.cc 2022-10-03 18:11:20.000000000
+0200
+++ new/poppler-22.11.0/splash/SplashBitmap.cc 2022-11-01 09:40:01.000000000
+0100
@@ -43,6 +43,7 @@
#include "SplashErrorCodes.h"
#include "SplashBitmap.h"
#include "poppler/Error.h"
+#include "poppler/GfxState.h"
#include "goo/JpegWriter.h"
#include "goo/PNGWriter.h"
#include "goo/TiffWriter.h"
@@ -114,7 +115,7 @@
rowSize = -rowSize;
}
if (alphaA) {
- alpha = (unsigned char *)gmallocn(width, height);
+ alpha = (unsigned char *)gmallocn_checkoverflow(width, height);
} else {
alpha = nullptr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/splash/SplashBitmap.h
new/poppler-22.11.0/splash/SplashBitmap.h
--- old/poppler-22.10.0/splash/SplashBitmap.h 2022-10-03 18:11:20.000000000
+0200
+++ new/poppler-22.11.0/splash/SplashBitmap.h 2022-11-01 09:40:01.000000000
+0100
@@ -34,11 +34,13 @@
#define SPLASHBITMAP_H
#include "SplashTypes.h"
-#include "poppler/GfxState.h"
#include "poppler_private_export.h"
#include <cstdio>
+#include <string>
+#include <vector>
class ImgWriter;
+class GfxSeparationColorSpace;
//------------------------------------------------------------------------
// SplashBitmap
@@ -80,7 +82,7 @@
{
int jpegQuality = -1;
bool jpegProgressive = false;
- GooString tiffCompression;
+ std::string tiffCompression;
bool jpegOptimize = false;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/splash/SplashXPathScanner.cc
new/poppler-22.11.0/splash/SplashXPathScanner.cc
--- old/poppler-22.10.0/splash/SplashXPathScanner.cc 2022-10-03
18:11:20.000000000 +0200
+++ new/poppler-22.11.0/splash/SplashXPathScanner.cc 2022-11-01
09:40:01.000000000 +0100
@@ -11,7 +11,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2008, 2010, 2014, 2018, 2019, 2021 Albert Astals Cid
<aa...@kde.org>
+// Copyright (C) 2008, 2010, 2014, 2018, 2019, 2021, 2022 Albert Astals Cid
<aa...@kde.org>
// Copyright (C) 2010 PaweÅ Wiejacha <pawel.wieja...@gmail.com>
// Copyright (C) 2013, 2014, 2021 Thomas Freitag <thomas.frei...@alfa.de>
// Copyright (C) 2018 Stefan Brüns <stefan.bru...@rwth-aachen.de>
@@ -27,6 +27,7 @@
#include <cstring>
#include <algorithm>
#include "goo/gmem.h"
+#include "goo/GooLikely.h"
#include "SplashMath.h"
#include "SplashXPath.h"
#include "SplashBitmap.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.10.0/utils/pdftoppm.cc
new/poppler-22.11.0/utils/pdftoppm.cc
--- old/poppler-22.10.0/utils/pdftoppm.cc 2022-10-03 18:11:20.000000000
+0200
+++ new/poppler-22.11.0/utils/pdftoppm.cc 2022-11-01 09:40:01.000000000
+0100
@@ -298,7 +298,7 @@
params.jpegQuality = jpegQuality;
params.jpegProgressive = jpegProgressive;
params.jpegOptimize = jpegOptimize;
- params.tiffCompression.Set(TiffCompressionStr);
+ params.tiffCompression = TiffCompressionStr;
if (ppmFile != nullptr) {
SplashError e;
