Merge remote-tracking branch 'origin/master' into master_github

tsdgeos · Jun 2, 2024 · 05c609a · 05c609a
2 parents 17d094e + 258f3ee
commit 05c609a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/glib/demo/fonts.c b/glib/demo/fonts.c
@@ -125,7 +125,8 @@ static gboolean pgd_fonts_fill_model(PgdFontsDemo *demo)
 
     font_info = poppler_font_info_new(demo->doc);
 
-    while (poppler_font_info_scan(font_info, 20, &fonts_iter)) {
+    while (scanned <= n_pages) {
+        poppler_font_info_scan(font_info, 20, &fonts_iter);
         pgd_fonts_update_progress(demo, n_pages, scanned);
 
         while (gtk_events_pending()) {

diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
@@ -3148,7 +3148,10 @@ PopplerFontInfo *poppler_font_info_new(PopplerDocument *document)
  *
  * <informalexample><programlisting>
  * font_info = poppler_font_info_new (document);
- * while (poppler_font_info_scan (font_info, 20, &fonts_iter)) {
+ * scanned_pages = 0;
+ * while (scanned_pages <= poppler_document_get_n_pages(document)) {
+ *         poppler_font_info_scan (font_info, 20, &fonts_iter);
+ *         scanned_pages += 20;
  *         if (!fonts_iter)
  *                 continue; /<!-- -->* No fonts found in these 20 pages *<!-- -->/
  *         do {
@@ -3159,7 +3162,7 @@ PopplerFontInfo *poppler_font_info_new(PopplerDocument *document)
  * }
  * </programlisting></informalexample>
  *
- * Returns: %TRUE, if there are more fonts left to scan
+ * Returns: %TRUE, if fonts were found
  */
 gboolean poppler_font_info_scan(PopplerFontInfo *font_info, int n_pages, PopplerFontsIter **iter)
 {

diff --git a/poppler/CurlCachedFile.cc b/poppler/CurlCachedFile.cc
@@ -7,6 +7,7 @@
 // Copyright 2009 Stefan Thomas <thomas@eload24.com>
 // Copyright 2010, 2011 Hib Eris <hib@hiberis.nl>
 // Copyright 2010, 2019, 2021, 2022 Albert Astals Cid <aacid@kde.org>
+// Copyright 2024 Oliver Sander <oliver.sander@tu-dresden.de>
 //
 //========================================================================
 

diff --git a/poppler/Error.cc b/poppler/Error.cc
@@ -19,6 +19,7 @@
 // Copyright (C) 2012 Marek Kasik <mkasik@redhat.com>
 // Copyright (C) 2013, 2017 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2020 Adam Reichold <adam.reichold@t-online.de>
+// Copyright (C) 2024 Oliver Sander <oliver.sander@tu-dresden.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

diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
@@ -27,7 +27,7 @@
 // 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>
 // Copyright (C) 2018, 2020 Philipp Knechtges <philipp-dev@knechtges.com>
-// Copyright (C) 2019, 2023 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright (C) 2019, 2023, 2024 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright (C) 2021 Hubert Figuiere <hub@figuiere.net>
 // Copyright (C) 2021 Christian Persch <chpe@src.gnome.org>
 // Copyright (C) 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk>

diff --git a/utils/pdfsig.cc b/utils/pdfsig.cc
@@ -12,7 +12,7 @@
 // Copyright 2017, 2019 Adrian Johnson <ajohnson@redneon.com>
 // Copyright 2018 Chinmoy Ranjan Pradhan <chinmoyrp65@protonmail.com>
 // Copyright 2019 Alexey Pavlov <alexpux@gmail.com>
-// Copyright 2019. 2023 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright 2019. 2023, 2024 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright 2019 Nelson Efrain A. Cruz <neac03@gmail.com>
 // Copyright 2021 Georgiy Sgibnev <georgiy@sgibnev.com>. Work sponsored by lab50.net.
 // Copyright 2021 Theofilos Intzoglou <int.teo@gmail.com>