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

.gitlab-ci.yml

@@ -50,7 +50,7 @@ build_clang16_libcpp:
   stage: build
   script:
     - echo "We want to compile with C++23 here because it has some nice things like deleted std::string nullptr constructor"
-    - sed -i -e "s@CMAKE_CXX_STANDARD 17@CMAKE_CXX_STANDARD 23@g" CMakeLists.txt
+    - sed -i -e "s@CMAKE_CXX_STANDARD 20@CMAKE_CXX_STANDARD 23@g" CMakeLists.txt
     - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
     - apt-get install --yes --no-install-recommends libclang-16-dev llvm-16-dev libc++-16-dev libc++abi-16-dev clang-tidy-16 clang-16 libunwind-16-dev gperf jq
     - srcdir=`pwd` && mkdir -p /tmp/poppler_build && cd /tmp/poppler_build
@@ -85,9 +85,9 @@ build_ubuntu_20_04:
     - ninja
     - ctest --output-on-failure
 
-build_mingw64_fedora39:
+build_mingw64_fedora40:
   stage: build
-  image: fedora:39
+  image: fedora:40
   before_script:
     - dnf install -y 'dnf-command(builddep)'
     - dnf builddep -y mingw64-poppler
@@ -97,12 +97,16 @@ build_mingw64_fedora39:
     - mingw64-cmake -DENABLE_NSS3=OFF -DENABLE_GPGME=OFF -G Ninja ..
     - ninja
 
-build_clazy_clang16:
+build_clazy_fedora40:
   stage: build
+  image: fedora:40
+  before_script:
+    - dnf install -y 'dnf-command(builddep)'
+    - dnf builddep -y poppler
+    - dnf -y install clazy ninja-build glibc-langpack-en
   script:
-    - apt-get install --yes --no-install-recommends clazy clang-16
     - mkdir -p build && cd build
-    - CC=clang-16 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DENABLE_GPGME=OFF -G Ninja ..
+    - CC=clang-18 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -G Ninja ..
     - CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static" ninja -j ${FDO_CI_CONCURRENT}
 
 build_qt5_android:

CMakeLists.txt

@@ -40,14 +40,14 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "24")
-set(POPPLER_MINOR_VERSION_STRING "02")
+set(POPPLER_MINOR_VERSION_STRING "03")
 # 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}")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION_STRING}.${POPPLER_MICRO_VERSION}")
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_STANDARD 11)
@@ -614,7 +614,7 @@ ADD_GPERF_FILE(TimesItalicWidths)
 ADD_GPERF_FILE(TimesRomanWidths)
 ADD_GPERF_FILE(ZapfDingbatsWidths)
 
-set(POPPLER_SOVERSION_NUMBER "134")
+set(POPPLER_SOVERSION_NUMBER "135")
 
 set(LINKER_SCRIPT "${CMAKE_BINARY_DIR}/libpoppler.map")
 configure_file(

NEWS

@@ -1,3 +1,15 @@
+Release 24.03.0:
+        core:
+         * Fix opening some malformed files. Issue #1447
+         * Skip drawing image when it has singular matrix. Issue #1114
+         * Fix crash on malformed files
+         * Small internal code cleanup
+
+        utils:
+         * pdfdetach: Fix potential directory traversal
+         * pdfimages: Enable to print filenames to stdout.
+         * pdfsig: Add visible name/date when signing an existing form signature field
+
 Release 24.02.0:
         core:
          * Fix reading some JBIG2 streams. Issue #1319

cpp/Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = "Poppler CPP"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 24.02.0
+PROJECT_NUMBER         = 24.03.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

poppler/CharCodeToUnicode.cc

@@ -13,7 +13,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2006, 2008-2010, 2012, 2018-2022 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2008-2010, 2012, 2018-2022, 2024 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
@@ -504,7 +504,7 @@ void CharCodeToUnicode::setMapping(CharCode c, Unicode *u, int len)
             }
         }
         if (!element) {
-            sMap.emplace_back(CharCodeToUnicodeString { c, {} });
+            sMap.emplace_back();
             element = std::ref(sMap.back());
         }
         map[c] = 0;

poppler/FlateEncoder.cc

@@ -31,7 +31,7 @@ FlateEncoder::FlateEncoder(Stream *strA) : FilterStream(strA)
     // -Wzero-as-null-pointer-constant warning.
     // For safety, check that the Z_NULL definition is equivalent to
     // 0 / null pointer.
-    static_assert(Z_NULL == 0);
+    static_assert(static_cast<int>(Z_NULL) == 0);
     zlib_stream.zalloc = nullptr;
     zlib_stream.zfree = nullptr;
     zlib_stream.opaque = nullptr;

poppler/Gfx.cc

@@ -5380,6 +5380,7 @@ void Gfx::restoreState()
     state = state->restore();
     out->restoreState(state);
     stackHeight--;
+    clip = clipNone;
 }
 
 // Create a new state stack, and initialize it with a copy of the